mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-09-21 21:21:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
748f8af229
Create/src/main
History
tterrag 748f8af229 Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2 
Conflicts:
	build.gradle
	src/main/java/com/simibubi/create/AllTileEntities.java
	src/main/java/com/simibubi/create/foundation/world/OreFeature.java
	src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java
	src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntityRenderer.java
	src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltColor.java
2020-03-28 22:28:49 -04:00
..
java/com/simibubi/create Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2 2020-03-28 22:28:49 -04:00
resources Recipe tweaks 2020-03-29 00:48:18 +01:00