Merge remote-tracking branch 'origin/mc1.20.1/fabric/dev' into mc1.20…

….1/fabric/dev

DIFFERENCES.md

@@ -1,4 +1,5 @@
 ### Intended gameplay differences compared to the Forge version.
 - Hose Pulleys can hold 3 buckets instead of 1.5.
-- Modified display source behaviors for Content Observers for different fluid units.
-- placed fluids behave a bit different due to no Fabric Fluid API
+- Placed fluids behave a bit different due to no Fabric Fluid API
+- Shortened / Full Number option for Display Links on Smart Observers
+  Set to read fluids has been replaced with fluid unit selection.

FABRIC_CHANGELOG.txt

@@ -23,6 +23,9 @@ Change logging starts below:
 - Fix pumps not draining fluids from custom cauldrons registered with CauldronFluidContent$registerCauldron (#1618)
 - Fix smart observers not updating their checked position (#1621)
 - Fix item transmutation with hoppers and toolboxes (#1493)
+- Fix nonsense fluid unit option when display links measured items (#995)
+- Fix copycat panels with framed glass not hiding faces when using sodium (#1540)
+- Fix filtered Smart Observers stopping listing matching items after finding 1 non-matching item (#996)
 - Merge in 0.5.1.g/h (https://github.com/Creators-of-Create/Create/wiki/0.5.1g-&-h)
 - Merge in 0.5.1.i (https://github.com/Creators-of-Create/Create/wiki/0.5.1i)
 - Merge in 0.5.1.j (https://github.com/Creators-of-Create/Create/wiki/0.5.1j)

src/generated/resources/.cache/1befec8d6a93075ce6b4cde2ad591d86e1289c0e

@@ -1,2 +1,2 @@
-// 1.20.1	2024-11-04T20:59:05.530951122	Create/Create's Recipe Serializer Tags
+// 1.20.1	2024-11-07T10:37:37.084479	Create/Create's Recipe Serializer Tags
 976b8a4cf8342e0e8a747ceeba448634f549fc9a data/create/tags/recipe_serializer/automation_ignore.json

src/generated/resources/.cache/35806e87dccf1c56c630455071f2d6dfd38015f6

@@ -1,4 +1,4 @@
-// 1.20.1	2024-11-04T20:59:05.531119453	Create/Create's Sequenced Assembly Recipes
-2d287e023d41b94bf9b2c446c01cd541132f1b60 data/create/recipes/sequenced_assembly/precision_mechanism.json
+// 1.20.1	2024-11-07T10:37:37.084611	Create/Create's Sequenced Assembly Recipes
 884fc364d6d332966eaccd28778f8c5097d19422 data/create/recipes/sequenced_assembly/sturdy_sheet.json
+2d287e023d41b94bf9b2c446c01cd541132f1b60 data/create/recipes/sequenced_assembly/precision_mechanism.json
 34028457bfd675066d61f029698dfe32360e7b10 data/create/recipes/sequenced_assembly/track.json

src/generated/resources/.cache/528ac2e8644db78e56272a28e1f653f416709616

@@ -1,16 +1,16 @@
-// 1.20.1	2024-11-04T20:59:05.53069661	Create/Create's Generated Registry Entries
-176a1226e308874605a73ab7a627b8d0ef87f3ed data/create/worldgen/placed_feature/striated_ores_nether.json
+// 1.20.1	2024-11-07T10:37:37.08427	Create/Create's Generated Registry Entries
+afdc8574e8e915dac5693f368e9c1260714ad111 data/create/damage_type/mechanical_roller.json
 451e7dab2b989b4c481c1d7c38ab9daab70474f5 data/create/worldgen/placed_feature/striated_ores_overworld.json
-b3f6cb5cfd9fd10d4841480632474800b34055ad data/create/worldgen/placed_feature/zinc_ore.json
-92b0416950ffeb3ba68811e587177c2f8811c2c5 data/create/damage_type/cuckoo_surprise.json
-4dae2c0fc9fe6749649ef06dd3b7baaa9bd5e807 data/create/damage_type/run_over.json
-d6f22959336e7dd19fc8593c5bad134462f51616 data/create/damage_type/fan_lava.json
-39576de9dc1368287a96a8627bbdef34954242e0 data/create/worldgen/configured_feature/striated_ores_overworld.json
-d2a4fdb64f4ba817e13a7b20c73fd1ca34b825fc data/create/damage_type/fan_fire.json
 030ede1044384c4117ac1e491bf5c78bbd2842f5 data/create/damage_type/crush.json
-c884779ba4426b688795c97b01299db17b481fdc data/create/damage_type/mechanical_drill.json
-afdc8574e8e915dac5693f368e9c1260714ad111 data/create/damage_type/mechanical_roller.json
 fbf6999fb922a0770cfbea3a8bddc11ba8b1552b data/create/worldgen/configured_feature/zinc_ore.json
+92b0416950ffeb3ba68811e587177c2f8811c2c5 data/create/damage_type/cuckoo_surprise.json
+4dae2c0fc9fe6749649ef06dd3b7baaa9bd5e807 data/create/damage_type/run_over.json
 58ab7a8eed0841f05b4b1373ba159e3e6503b7c3 data/create/damage_type/potato_cannon.json
 ed83634a4af759ef80cfd1101f5715d38268620f data/create/worldgen/configured_feature/striated_ores_nether.json
+d2a4fdb64f4ba817e13a7b20c73fd1ca34b825fc data/create/damage_type/fan_fire.json
+b3f6cb5cfd9fd10d4841480632474800b34055ad data/create/worldgen/placed_feature/zinc_ore.json
+39576de9dc1368287a96a8627bbdef34954242e0 data/create/worldgen/configured_feature/striated_ores_overworld.json
+176a1226e308874605a73ab7a627b8d0ef87f3ed data/create/worldgen/placed_feature/striated_ores_nether.json
+d6f22959336e7dd19fc8593c5bad134462f51616 data/create/damage_type/fan_lava.json
+c884779ba4426b688795c97b01299db17b481fdc data/create/damage_type/mechanical_drill.json
 43cfce97a9326a1a7ce95f91a052586610b9686c data/create/damage_type/mechanical_saw.json

src/generated/resources/.cache/5941507bfa52efb23b73a8b0f1a97554e2aada1d

@@ -1,2 +1,2 @@
-// 1.20.1	2024-11-04T20:59:05.509373982	Create/Create's Custom Sounds
+// 1.20.1	2024-11-07T10:37:37.062336	Create/Create's Custom Sounds
 bcfd9320f8ed54f3282b1757a41da0d1753e1754 assets/create/sounds.json

src/generated/resources/.cache/8374d11e7b3d6ea1837e31911da1439b12da9432

@@ -1,5 +1,5 @@
-// 1.20.1	2024-11-04T20:59:05.509905419	Create/Create's Mechanical Crafting Recipes
-d2cc0e77f2d9864d6aa373e7be7ac83ef9bf357a data/create/recipes/mechanical_crafting/wand_of_symmetry.json
-b24b97d694f24fa366e5e559af45ec8c5ade90ae data/create/recipes/mechanical_crafting/potato_cannon.json
+// 1.20.1	2024-11-07T10:37:37.062839	Create/Create's Mechanical Crafting Recipes
 75ed217b219788ede2145726272f0ab2bb747edc data/create/recipes/mechanical_crafting/crushing_wheel.json
+b24b97d694f24fa366e5e559af45ec8c5ade90ae data/create/recipes/mechanical_crafting/potato_cannon.json
+d2cc0e77f2d9864d6aa373e7be7ac83ef9bf357a data/create/recipes/mechanical_crafting/wand_of_symmetry.json
 d588edebb9150f6c857c0415a2099404db8fa383 data/create/recipes/mechanical_crafting/extendo_grip.json