JozsefA c905aa5e2e Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java # src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java # src/main/java/com/simibubi/create/content/logistics/block/FlapData.java # src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java		2021-03-30 14:58:08 -07:00
..
generated/resources	Port new Changes	2021-03-30 18:34:55 +02:00
main	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-30 14:58:08 -07:00