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
..
generated/resources	eir's token	2020-05-20 15:41:55 +02:00
main	Merge remote-tracking branch 'origin/master'	2020-09-22 03:17:24 +02:00