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
..
block	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-30 14:58:08 -07:00
client	Merge & Port	2021-03-26 23:13:49 +01:00
filtering	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-06 22:43:01 +01:00
item	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-19 00:49:39 +01:00
packet	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-06 21:41:02 +01:00
ClientSchematicLoader.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
ISpecialBlockItemRequirement.java	Re-organized packages and utilities	2020-05-23 14:02:38 +02:00
ISpecialEntityItemRequirement.java	Re-organized packages and utilities	2020-05-23 14:02:38 +02:00
ItemRequirement.java	Fix some stuff, break othter stuff	2021-03-20 17:33:35 +01:00
MaterialChecklist.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-12-13 15:33:45 +01:00
SchematicProcessor.java	Bloat.	2021-02-18 19:43:22 +01:00
SchematicWorld.java	port recent changes	2021-03-24 14:54:24 +01:00
ServerSchematicLoader.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-06 21:41:02 +01:00