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
..
.cache	fixup! Split mixing and mechanical crafting categories	2020-10-16 18:58:35 +02:00
assets/create	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-10-16 19:11:29 +02:00
data	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-10-12 22:15:32 +02:00