mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-11-16 15:34:39 +01:00
b5802bb0e8
# 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 |
||
---|---|---|
.. | ||
blockstates | ||
lang | ||
models | ||
sounds.json |