mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 22:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
28bc839572
Create/src
History
PepperCode1 28bc839572 Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	gradle.properties
	src/generated/resources/.cache/cache
	src/main/java/com/simibubi/create/content/contraptions/render/ContraptionRenderDispatcher.java
	src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java
	src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
	src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
	src/main/java/com/simibubi/create/foundation/render/BakedModelRenderHelper.java
	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
2023-07-03 15:08:50 -07:00
..
generated/resources Merge branch 'mc1.18/dev' into mc1.19/dev 2023-07-03 15:08:50 -07:00
main Merge branch 'mc1.18/dev' into mc1.19/dev 2023-07-03 15:08:50 -07:00