Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 22:11:50 +01:00
Code Issues Projects Releases Packages Wiki Activity
Create/src/generated
History
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
..
resources Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-16 19:11:29 +02:00