Merge remote-tracking branch 'forge/mc1.20.1/dev' into mc1.20.1/fabric/dev

# Conflicts:
#	.github/workflows/build.yml
#	build.gradle
#	gradle.properties
#	src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9
#	src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0
#	src/main/java/com/simibubi/create/AllFluids.java
#	src/main/java/com/simibubi/create/Create.java
#	src/main/java/com/simibubi/create/compat/ftb/FTBIntegration.java
#	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
#	src/main/java/com/simibubi/create/compat/jei/StockKeeperTransferHandler.java
#	src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
#	src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java
#	src/main/java/com/simibubi/create/content/equipment/goggles/GogglesItem.java
#	src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java
#	src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java
#	src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
#	src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/packager/repackager/PackageRepackageHelper.java
#	src/main/java/com/simibubi/create/content/logistics/packager/repackager/RepackagerBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBehaviour.java
#	src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticsManager.java
#	src/main/java/com/simibubi/create/content/logistics/packagerLink/PackagerLinkBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/redstoneRequester/RedstoneRequesterMenu.java
#	src/main/java/com/simibubi/create/content/logistics/stockTicker/StockCheckingBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
#	src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java
#	src/main/java/com/simibubi/create/content/processing/burner/LitBlazeBurnerBlock.java
#	src/main/java/com/simibubi/create/content/processing/recipe/ProcessingInventory.java
#	src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
#	src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java
#	src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/InvManipulationBehaviour.java
#	src/main/java/com/simibubi/create/foundation/events/InputEvents.java
#	src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
#	src/main/java/com/simibubi/create/impl/unpacking/CrafterUnpackingHandler.java
#	src/main/java/com/simibubi/create/impl/unpacking/DefaultUnpackingHandler.java
#	src/main/java/com/simibubi/create/infrastructure/command/AllCommands.java
#	src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java
#	src/main/java/com/simibubi/create/infrastructure/debugInfo/DebugInformation.java

Author: TropheusJ

build.gradle.kts

@@ -69,7 +69,7 @@ val buildNum = providers.environmentVariable("GITHUB_RUN_NUMBER")
     .orElse("-local")
     .getOrElse("")
 
-version = "6.0.0.0+mc$minecraftVersion$buildNum"
+version = "6.0.4.0+mc$minecraftVersion$buildNum"
 
 group = "com.simibubi.create"
 base.archivesName = "create-fabric"

changelog.md

@@ -1,3 +1,47 @@
+------------------------------------------------------
+Create 6.0.4
+------------------------------------------------------
+
+#### Bug Fixes
+
+- Fixed crash when using mechanical arms with composters #7965
+- Fixed chocolate and honey having the wrong map color #5409
+- Fixed goggles not swapping with helmet when equipped #7977
+- Fixed fluid pipe visuals rendering with incorrect uv scale
+- Fixed Re-packager creating invalid item stacks when factory gauges were assigned larger stacks #7963
+- Fixed nixie tubes not updating their text in ponder scenes #7978
+- Clicking conveyors with chains or the wrench now takes priority over picking up packagers from them
+- Fix Processing recipes ignoring item components (1.21) #7962
+
+------------------------------------------------------
+Create 6.0.3
+------------------------------------------------------
+
+#### Bug Fixes
+
+- Fixed certain block entities not rendering on contraptions #7790 #7782 #7774
+- Fixed sign text and color getting removed by display links #7250
+- Changed sandpaper item rendering to use Gui transform
+- Fixed crash when using or viewing sandpaper polishing recipes (1.21)
+- Fixed crash with recent versions of ftb library
+- Fixed belts interacting with horizontal crushing wheels inconsistently #7445
+- Allow Re-Packager to split packages with multiple crafting recipes into single packages 
+- Fixed contraptions not able to break ice blocks #4415
+- Increased rope pulley view distance #4836
+- Fixed create datagen running in addon workspaces (#7862)
+- Fixed Fluid recipes missing outputs, and crash when using create fluid buckets on basin (#7884)
+- Fixed crash when placing empty linked controllers in lecterns #7876
+- Fixed issues with elevator contact display link behavior
+- Fixed double chest lighting on contraptions
+- Added flywheel optimisations for fluids in windowed pipes
+- Fixed bogey lighting not updating correctly while switching between styles
+- Fixed cardboard sword not being enchantable #7736
+- Fixed crash with redstone requester #7788
+- Fixed being able to enchant cardboard swords with other enchantments when using anvils
+- Fixed metal ladders being able to hang in wrong directions #7395
+- Fixed player chain conveyor animation playing when game is paused #7390
+- Fixed elevator floor description rendering being offset from the controls block
+
 ------------------------------------------------------
 Create 6.0.2
 ------------------------------------------------------
@@ -10,7 +54,7 @@ Create 6.0.2
 - Fixed Shopping lists disappearing when clicking a different table cloth #7548
 - Fix mixin conflict with immersive portals
 - Fix factory gauge display sources causing crashes #7645
-- Fix BlockEntityRenderHelper ignoring BlockEntityRender#shouldRender #7639
+- Fix Schematics sometimes rendering block entity elements when it shouldn't #7639
 - Fix Chiseled Bookshelves having wrong the blockstates when placed with a schematic cannon #7642
 - Fix horizontal crushing wheels not working properly #7445
 - Fix rotating shader not correctly handling color
@@ -28,10 +72,17 @@ Create 6.0.2
 - Fix rotation keybind not supporting mouse buttons
 - Fixed deployers not being able to harvest honeycomb with modded shears #4570
 - Safety check for schedule pointer exceeding the total count #7492
-- Default packager unwrapping behaviour uses more robust insertion method when not in a simulation #7426
+- Fixed packager unpacking leading to item multiplication in special modded inventories #7426
 - Fixed redstone links not updating neighbours when toggling from receiver to transmitter #7715
 - Fix KineticStressDisplaySource not working properly #7659
 - Fix sequenced assembly not correctly handling errors (1.21.1)
+- The JEI search bar is now synchronised to the stock keeper search bar (configurable)
+- Fixed JEI plugin modifying ingredient fluid amounts for visual purposes
+- Fixed belts moving a sneaking player even when not wearing the full cardboard set #7691
+- Packagers can now read multiple lines on signs for package addressing
+- Factory Gauge request interval is now configurable
+- Fixed train map integration crashing when there are derailed trains or trains in another dimension (1.21.1)
+- Fixed cardboard armor rendering not respecting custom player scaling
 
 #### API Changes