PepperCode1 4b3a972b9b Merge branch 'mc1.18/dev' into mc1.19/dev ... Conflicts: src/main/java/com/simibubi/create/Create.java src/main/java/com/simibubi/create/CreateClient.java src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerApplicationRecipe.java src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleTileEntity.java src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHandler.java src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingRecipe.java src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerData.java src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipe.java src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlicer.java src/main/java/com/simibubi/create/content/curiosities/armor/BackTankUtil.java src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankArmorLayer.java src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelTileEntity.java src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java src/main/java/com/simibubi/create/content/logistics/block/display/source/AccumulatedItemCountDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/BoilerDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/DisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/EnchantPowerDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidAmountDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidListDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemCountDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemThoughputDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticSpeedDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/NumericSingleLineDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/PercentOrProgressBarDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/RedstonePowerDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/ScoreboardDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/SingleLineDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/StationSummaryDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/StopWatchDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/TimeOfDayDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/display/source/ValueListDisplaySource.java src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeTileEntity.java src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerClientHandler.java src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterContainer.java src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreen.java src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainStatus.java src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayTileEntity.java src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMarker.java src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/TrainEditPacket.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/IScheduleInput.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItem.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleScreen.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/CargoThresholdCondition.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/FluidThresholdCondition.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ItemThresholdCondition.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/PlayerPassengerCondition.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/RedstoneLinkCondition.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimeOfDayCondition.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimedWaitCondition.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeTitleInstruction.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/DestinationInstruction.java src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/TextScheduleInstruction.java src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java src/main/java/com/simibubi/create/content/schematics/client/SchematicPromptScreen.java src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java src/main/java/com/simibubi/create/content/schematics/client/ToolSelectionScreen.java src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java src/main/java/com/simibubi/create/events/ClientEvents.java src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java src/main/java/com/simibubi/create/foundation/command/CloneCommand.java src/main/java/com/simibubi/create/foundation/command/ConfigCommand.java src/main/java/com/simibubi/create/foundation/command/CouplingCommand.java src/main/java/com/simibubi/create/foundation/command/DumpRailwaysCommand.java src/main/java/com/simibubi/create/foundation/command/FixLightingCommand.java src/main/java/com/simibubi/create/foundation/command/FlySpeedCommand.java src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java src/main/java/com/simibubi/create/foundation/command/KillTrainCommand.java src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java src/main/java/com/simibubi/create/foundation/command/ReplaceInCommandBlocksCommand.java src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java src/main/java/com/simibubi/create/foundation/config/ui/ConfigModListScreen.java src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreenList.java src/main/java/com/simibubi/create/foundation/config/ui/HintableTextFieldWidget.java src/main/java/com/simibubi/create/foundation/config/ui/OpenCreateMenuButton.java src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java src/main/java/com/simibubi/create/foundation/config/ui/entries/NumberEntry.java src/main/java/com/simibubi/create/foundation/config/ui/entries/ValueEntry.java src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java src/main/java/com/simibubi/create/foundation/gui/CreateMainMenuScreen.java src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java src/main/java/com/simibubi/create/foundation/gui/element/TextStencilElement.java src/main/java/com/simibubi/create/foundation/gui/widget/AbstractSimiWidget.java src/main/java/com/simibubi/create/foundation/gui/widget/Label.java src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java src/main/java/com/simibubi/create/foundation/item/ItemDescription.java src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java src/main/java/com/simibubi/create/foundation/ponder/PonderTooltipHandler.java src/main/java/com/simibubi/create/foundation/ponder/content/DisplayScenes.java src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java src/main/java/com/simibubi/create/foundation/ponder/ui/PonderTagIndexScreen.java src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java src/main/java/com/simibubi/create/foundation/utility/Debug.java src/main/java/com/simibubi/create/foundation/utility/DynamicComponent.java src/main/java/com/simibubi/create/foundation/utility/FluidFormatter.java src/main/java/com/simibubi/create/foundation/utility/Lang.java src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java		2022-08-03 12:40:21 -07:00
..
CombinedTankWrapper.java	I bug to differ	2022-07-10 18:22:47 +02:00
FluidHelper.java	Merge branch 'mc1.18/dev' into mc1.19/dev	2022-08-03 12:40:21 -07:00
FluidIngredient.java	Merge branch 'mc1.18/dev' into mc1.19/dev	2022-08-03 12:40:21 -07:00
FluidRenderer.java	Fluids & Biome Modifiers	2022-08-01 22:37:39 +02:00
SmartFluidTank.java	Housekeeping	2021-04-08 19:22:11 +02:00