Commit graph

77 commits

Author SHA1 Message Date
Adubbz
945f4427ea Added the grassland 2021-12-12 15:17:58 +11:00
Adubbz
2ad8e07813 Implemented the field 2021-12-12 13:17:05 +11:00
Adubbz
dd2d313981 Implemented the snowy coniferous forest 2021-12-12 11:00:47 +11:00
Adubbz
1250c10a21 Added the seasonal forest 2021-12-05 17:54:47 +11:00
Adubbz
3ae595285a Merge branch 'BOP-1.18.x-15.x.x' of https://github.com/Glitchfiend/BiomesOPlentyDev into BOP-1.18.x-15.x.x
# Conflicts:
#	public/src/main/java/biomesoplenty/api/biome/BOPBiomes.java
#	src/main/java/biomesoplenty/common/biome/BOPOverworldBiomeBuilder.java
#	src/main/java/biomesoplenty/init/ModBiomes.java
2021-12-05 13:55:17 +11:00
Adubbz
b4d921eac2 Implemented the lavender field 2021-12-05 13:47:42 +11:00
SuperCoder79
6a9d96b853 Add redwood forest 2021-12-04 21:25:43 -05:00
Forstride
0cf215432c Added Cherry Blossom Grove 2021-12-03 15:15:33 -05:00
SuperCoder79
b5abc7d104 Merge 2021-12-02 20:49:50 -05:00
SuperCoder79
03ce75d5d0 Add bamboo blossom grove 2021-12-02 20:45:59 -05:00
Adubbz
7cf6dee58d Added the Woodland 2021-12-03 11:29:45 +11:00
Adubbz
f3ef61d501 Updated the coniferous forest to 1.18 2021-12-02 17:20:56 +11:00
Adubbz
cf9c865a0f Blocks O' Plenty 2021-12-01 21:04:28 +11:00
Adubbz
b03c90452f git subrepo pull --force public
subrepo:
  subdir:   "public"
  merged:   "4b2f54ad"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "4b2f54ad"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-12-01 16:03:52 +11:00
Adubbz
26c082881c git subrepo pull --force public
subrepo:
  subdir:   "public"
  merged:   "43560d51"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "43560d51"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-08-25 13:05:48 +10:00
Adubbz
f0123485e5 Fixed merge conflicts 2021-08-18 13:34:46 +10:00
Adubbz
eccbd83afb git subrepo commit (merge) public
subrepo:
  subdir:   "public"
  merged:   "1ae9e680"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "d54666a0"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-08-18 13:18:44 +10:00
Forstride
87eda1720b Added Hair and Pus Bubbles to the Visceral Heap 2021-08-03 22:35:21 -04:00
Forstride
3440d7b243 Added blood drip particles, tweaked flesh tendon generation 2021-08-03 15:30:44 -04:00
Forstride
ed45a5c970 Added Blackstone Spines and Blackstone Bulbs to the Withered Abyss 2021-08-02 20:47:36 -04:00
Forstride
bd29e9aa3c Added Flesh Tendon Strands to the Visceral Heap 2021-08-02 16:06:46 -04:00
Adubbz
820c5f8805 git subrepo pull public
subrepo:
  subdir:   "public"
  merged:   "c900619c"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "c900619c"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-08-02 21:06:38 +10:00
Forstride
0f589e77bb Added Blood liquid and Porous Flesh blocks to the Visceral Heap. NOTE: The Blood fluid is not 100% finished and will have minor issues. 2021-08-02 05:24:39 -04:00
Forstride
3f47841dd8 Merge branch 'BOP-1.17.x-14.x.x' of https://github.com/Glitchfiend/BiomesOPlentyDev into BOP-1.17.x-14.x.x 2021-07-31 20:13:22 -04:00
Forstride
4ad93e65cc git subrepo pull public
subrepo:
  subdir:   "public"
  merged:   "e3af2b81"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "e3af2b81"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-07-31 19:36:52 -04:00
Adubbz
bad81cc782 git subrepo pull public
subrepo:
  subdir:   "public"
  merged:   "e3af2b81"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "e3af2b81"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-08-01 09:19:49 +10:00
Adubbz
4abafe85b2 git subrepo clone https://github.com/Glitchfiend/BiomesOPlenty.git public
subrepo:
  subdir:   "public"
  merged:   "7d8d5a11"
upstream:
  origin:   "https://github.com/Glitchfiend/BiomesOPlenty.git"
  branch:   "BOP-public"
  commit:   "7d8d5a11"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-07-31 16:49:33 +10:00