into develop

Conflicts:
	pom.xml
This commit is contained in:
tastybento 2021-12-21 14:29:52 -08:00
commit 6e41588405
2 changed files with 2 additions and 1 deletions

View File

@ -277,4 +277,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

View File

@ -280,6 +280,7 @@ biomes:
plants:
RED_MUSHROOM: 20:GRASS_BLOCK
BROWN_MUSHROOM: 20:GRASS_BLOCK
BLUE_ORCHID: 10:GRASS_BLOCK
LILY_PAD: 5:WATER
mobs:
SLIME: 5:WATER