Zelophed b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/generated/resources/.cache/cache # src/main/java/com/simibubi/create/compat/jei/CreateJEI.java # src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java # src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java		2020-10-16 19:11:29 +02:00
..
blockstates	Deforester works on slime saplings	2020-10-16 11:14:47 +02:00
lang	fixup! Split mixing and mechanical crafting categories	2020-10-16 18:58:35 +02:00
models	Port Changes to 1.16, Fix server launch	2020-10-12 22:16:06 +02:00
sounds.json	he do be munching tho	2020-07-19 17:08:20 +02:00