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
78fbb52ddc
Create/src/main
History
JozsefA 78fbb52ddc Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
#	src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
2021-03-31 21:17:01 -07:00
..
java/com/simibubi/create Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev 2021-03-31 21:17:01 -07:00
resources Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 14:50:16 +02:00