Ell 7c8c51cf4b Merge remote-tracking branch 'origin/master' ... # Conflicts: # build.gradle # src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java # src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java		2020-09-22 03:17:24 +02:00
..
java/de/ellpeck/naturesaura	Merge remote-tracking branch 'origin/master'	2020-09-22 03:17:24 +02:00
resources	Fixed the snow creator using the wrong config flag	2020-09-02 21:55:01 +02:00