mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-15 23:14:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
fd62f2f8f4
Create/src/main
History
zelophed fd62f2f8f4 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/CreateClient.java
#	src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java
#	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
#	src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
2021-05-03 19:58:39 +02:00
..
java/com/simibubi/create Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-05-03 19:58:39 +02:00
resources Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-05-03 19:58:39 +02:00