Merged branch 'develop' https://github.com/BentoBoxWorld/Greenhouses.git
into develop Conflicts: pom.xml
This commit is contained in:
commit
6e41588405
2
pom.xml
2
pom.xml
|
@ -277,4 +277,4 @@
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -280,6 +280,7 @@ biomes:
|
||||||
plants:
|
plants:
|
||||||
RED_MUSHROOM: 20:GRASS_BLOCK
|
RED_MUSHROOM: 20:GRASS_BLOCK
|
||||||
BROWN_MUSHROOM: 20:GRASS_BLOCK
|
BROWN_MUSHROOM: 20:GRASS_BLOCK
|
||||||
|
BLUE_ORCHID: 10:GRASS_BLOCK
|
||||||
LILY_PAD: 5:WATER
|
LILY_PAD: 5:WATER
|
||||||
mobs:
|
mobs:
|
||||||
SLIME: 5:WATER
|
SLIME: 5:WATER
|
||||||
|
|
Loading…
Reference in New Issue