Create/src
PepperCode1 5cf74212d9 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.19.3/dev
Conflicts:
	build.gradle
	gradle.properties
	src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java
	src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java
2023-03-08 17:55:59 -08:00
..
generated/resources Oops, all data 2023-02-06 18:26:56 +01:00
main Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.19.3/dev 2023-03-08 17:55:59 -08:00