JozsefA 15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge ... # Conflicts: # src/main/java/com/simibubi/create/AllEntityTypes.java # src/main/java/com/simibubi/create/AllSpriteShifts.java # src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java # src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java # src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java # src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java # src/main/java/com/simibubi/create/foundation/command/AllCommands.java # src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java		2021-02-15 21:27:08 -08:00
..
contraptions	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge	2021-02-15 21:27:08 -08:00
curiosities	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge	2021-02-15 21:27:08 -08:00
logistics	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge	2021-02-15 21:27:08 -08:00
palettes	Fix slab loot tables	2020-11-11 00:57:29 +08:00
schematics	Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge	2021-02-15 21:27:08 -08:00
AllSections.java	Windmill is Bearing is Clockwork	2020-10-22 00:50:17 +02:00
CreateItemGroup.java	Re-organized packages and utilities	2020-05-23 14:02:38 +02:00