zelophed d03ea3488a Merge branch 'mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/generated/resources/.cache/cache # src/generated/resources/assets/create/blockstates/andesite_funnel.json # src/generated/resources/assets/create/blockstates/brass_funnel.json # src/generated/resources/assets/create/lang/unfinished/de_de.json # src/generated/resources/assets/create/lang/unfinished/es_es.json # src/generated/resources/assets/create/lang/unfinished/fr_fr.json # src/generated/resources/assets/create/lang/unfinished/it_it.json # src/generated/resources/assets/create/lang/unfinished/ja_jp.json # src/generated/resources/assets/create/lang/unfinished/ko_kr.json # src/generated/resources/assets/create/lang/unfinished/nl_nl.json # src/generated/resources/assets/create/lang/unfinished/pt_br.json # src/main/java/com/simibubi/create/AllBlocks.java # src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java # src/main/java/com/simibubi/create/content/contraptions/components/actors/ContraptionActorData.java # src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java # src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java # src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java # src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java # src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java # src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java # src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java # src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java # src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java # src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java # src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java # src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java # src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java # src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java # src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java # src/main/java/com/simibubi/create/events/ClientEvents.java # src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java # src/main/java/com/simibubi/create/foundation/collision/CollisionDebugger.java # src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java # src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java # src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java # src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java # src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java # src/main/java/com/simibubi/create/foundation/gui/AllIcons.java # src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java # src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java # src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java # src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java # src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java # src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java # src/main/java/com/simibubi/create/foundation/render/backend/Backend.java # src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java # src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java # src/main/java/com/simibubi/create/foundation/utility/ColorHelper.java # src/main/java/com/simibubi/create/foundation/utility/Lang.java # src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java # src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java # src/main/java/com/simibubi/create/foundation/utility/VecHelper.java # src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java # src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java		2021-03-20 12:58:02 +01:00
..
compat/jei	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
content	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
events	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
foundation	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
AllBlockPartials.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
AllBlocks.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
AllColorHandlers.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-19 00:49:39 +01:00
AllContainerTypes.java	Re-organized packages and utilities	2020-05-23 14:02:38 +02:00
AllEntityTypes.java	Make contraptions not take that stupid amount of cpu time when in water	2021-03-01 10:37:49 +01:00
AllFluids.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-01-04 14:15:53 +01:00
AllItems.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
AllKeys.java	ForgeCraft Playtesting, Part I	2020-10-13 19:56:12 +02:00
AllMovementBehaviours.java	Refactor Attractor	2020-11-19 21:07:32 +01:00
AllParticleTypes.java	Spinny vortex	2020-11-06 19:45:38 +01:00
AllRecipeTypes.java	More unfinished basin business	2020-10-06 20:43:13 +02:00
AllShapes.java	Funnel Fantasy VII	2021-02-28 23:49:51 +01:00
AllSoundEvents.java	Grunt work detected	2020-08-27 02:35:57 +02:00
AllSpecialTextures.java	Fundamentals of Fluid Transfer	2020-08-24 21:02:03 +02:00
AllSpriteShifts.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
AllTags.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
AllTileEntities.java	Better contraption actor instancing.	2021-03-16 15:52:37 -07:00
Create.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-02-19 00:49:39 +01:00
CreateClient.java	Some semblance of immersive portals compat.	2021-03-15 15:58:41 -07:00