post merge fixes & datagen

src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa

@@ -1,4 +1,4 @@
-// 1.19.2	2024-02-21T18:22:22.2736655	Create's Sequenced Assembly Recipes
-6aff58e266ccffe76e3af529c5d27ca80452e5a3 data\create\recipes\sequenced_assembly\sturdy_sheet.json
-34028457bfd675066d61f029698dfe32360e7b10 data\create\recipes\sequenced_assembly\track.json
-2d287e023d41b94bf9b2c446c01cd541132f1b60 data\create\recipes\sequenced_assembly\precision_mechanism.json
+// 1.19.2	2024-08-10T10:07:20.384986465	Create's Sequenced Assembly Recipes
+2d287e023d41b94bf9b2c446c01cd541132f1b60 data/create/recipes/sequenced_assembly/precision_mechanism.json
+884fc364d6d332966eaccd28778f8c5097d19422 data/create/recipes/sequenced_assembly/sturdy_sheet.json
+34028457bfd675066d61f029698dfe32360e7b10 data/create/recipes/sequenced_assembly/track.json

src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9

@@ -1,5 +1,5 @@
-// 1.19.2	2024-02-21T18:22:22.2746654	Create's Mechanical Crafting Recipes
-d588edebb9150f6c857c0415a2099404db8fa383 data\create\recipes\mechanical_crafting\extendo_grip.json
-3b2837b08607c1ca466fa3eb418209b2e55da6ba data\create\recipes\mechanical_crafting\potato_cannon.json
-75ed217b219788ede2145726272f0ab2bb747edc data\create\recipes\mechanical_crafting\crushing_wheel.json
-d2cc0e77f2d9864d6aa373e7be7ac83ef9bf357a data\create\recipes\mechanical_crafting\wand_of_symmetry.json
+// 1.19.2	2024-08-10T10:07:20.388761349	Create's Mechanical Crafting Recipes
+d2cc0e77f2d9864d6aa373e7be7ac83ef9bf357a data/create/recipes/mechanical_crafting/wand_of_symmetry.json
+3b2837b08607c1ca466fa3eb418209b2e55da6ba data/create/recipes/mechanical_crafting/potato_cannon.json
+75ed217b219788ede2145726272f0ab2bb747edc data/create/recipes/mechanical_crafting/crushing_wheel.json
+d588edebb9150f6c857c0415a2099404db8fa383 data/create/recipes/mechanical_crafting/extendo_grip.json

src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139

@@ -1,2 +1,2 @@
-// 1.19.2	2024-02-21T18:22:22.2076656	Create's Custom Sounds
-043955db25ffe58e7debb9a4f11e41a9571376e6 assets\create\sounds.json
+// 1.19.2	2024-08-10T10:07:20.430704681	Create's Custom Sounds
+bcfd9320f8ed54f3282b1757a41da0d1753e1754 assets/create/sounds.json

src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95

@@ -1,2 +1,2 @@
-// 1.19.2	2024-02-21T18:22:22.2766682	Create's Recipe Serializer Tags
-976b8a4cf8342e0e8a747ceeba448634f549fc9a data\create\tags\recipe_serializer\automation_ignore.json
+// 1.19.2	2024-08-10T10:07:20.430472276	Create's Recipe Serializer Tags
+976b8a4cf8342e0e8a747ceeba448634f549fc9a data/create/tags/recipe_serializer/automation_ignore.json

src/generated/resources/data/c/tags/items/dusts/obsidian.json

@@ -1,4 +1,5 @@
 {
+  "replace": false,
   "values": [
     "create:powdered_obsidian"
   ]

src/generated/resources/data/create/loot_tables/blocks/copper_backtank.json

@@ -12,17 +12,13 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            },
             {
               "function": "minecraft:copy_nbt",
               "ops": [
                 {
-                  "op": "replace",
-                  "source": "Air",
-                  "target": "Air"
+                  "op": "merge",
+                  "source": "VanillaTag",
+                  "target": "{}"
                 }
               ],
               "source": "block_entity"
@@ -32,8 +28,8 @@
               "ops": [
                 {
                   "op": "replace",
-                  "source": "Enchantments",
-                  "target": "Enchantments"
+                  "source": "Air",
+                  "target": "Air"
                 }
               ],
               "source": "block_entity"

src/generated/resources/data/create/loot_tables/blocks/netherite_backtank.json

@@ -12,17 +12,13 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            },
             {
               "function": "minecraft:copy_nbt",
               "ops": [
                 {
-                  "op": "replace",
-                  "source": "Air",
-                  "target": "Air"
+                  "op": "merge",
+                  "source": "VanillaTag",
+                  "target": "{}"
                 }
               ],
               "source": "block_entity"
@@ -32,8 +28,8 @@
               "ops": [
                 {
                   "op": "replace",
-                  "source": "Enchantments",
-                  "target": "Enchantments"
+                  "source": "Air",
+                  "target": "Air"
                 }
               ],
               "source": "block_entity"

src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json

@@ -5,7 +5,17 @@
       "bonus_rolls": 0.0,
       "conditions": [
         {
-          "condition": "minecraft:survives_explosion"
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:silk_touch",
+                "levels": {
+                  "min": 1
+                }
+              }
+            ]
+          }
         }
       ],
       "entries": [

src/generated/resources/data/create/recipes/blasting/ingot_aluminum_compat_ic2.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_aluminum"
-  },
-  "result": "ic2:ingot_aluminum",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "ic2"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_aluminum"
+  },
+  "result": "ic2:ingot_aluminum"
 }

src/generated/resources/data/create/recipes/blasting/ingot_silver_compat_ic2.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_silver"
-  },
-  "result": "ic2:ingot_silver",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "ic2"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_silver"
+  },
+  "result": "ic2:ingot_silver"
 }

src/generated/resources/data/create/recipes/blasting/ingot_tin_compat_ic2.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_tin"
-  },
-  "result": "ic2:ingot_tin",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "ic2"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_tin"
+  },
+  "result": "ic2:ingot_tin"
 }

src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_ic2.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_uranium"
-  },
-  "result": "ic2:ingot_uranium",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "ic2"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_uranium"
+  },
+  "result": "ic2:ingot_uranium"
 }

src/generated/resources/data/create/recipes/blasting/lead_ingot_compat_oreganized.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_lead"
-  },
-  "result": "oreganized:lead_ingot",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "oreganized"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_lead"
+  },
+  "result": "oreganized:lead_ingot"
 }

src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_galosphere.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_silver"
-  },
-  "result": "galosphere:silver_ingot",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "galosphere"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_silver"
+  },
+  "result": "galosphere:silver_ingot"
 }

src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_iceandfire.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_silver"
-  },
-  "result": "iceandfire:silver_ingot",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "iceandfire"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_silver"
+  },
+  "result": "iceandfire:silver_ingot"
 }

src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_oreganized.json

@@ -1,17 +1,17 @@
 {
   "type": "minecraft:blasting",
-  "ingredient": {
-    "item": "create:crushed_raw_silver"
-  },
-  "result": "oreganized:silver_ingot",
-  "experience": 0.1,
   "cookingtime": 100,
+  "experience": 0.1,
   "fabric:load_conditions": [
     {
       "condition": "fabric:all_mods_loaded",
       "values": [
         "oreganized"
       ]
     }
-  ]
+  ],
+  "ingredient": {
+    "item": "create:crushed_raw_silver"
+  },
+  "result": "oreganized:silver_ingot"
 }

src/generated/resources/data/create/recipes/crushing/compat/ae2/deepslate_quartz_ore.json

@@ -1,34 +1,34 @@
 {
   "type": "create:crushing",
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "ae2"
+      ]
+    }
+  ],
   "ingredients": [
     {
       "item": "ae2:deepslate_quartz_ore"
     }
   ],
+  "processingTime": 300,
   "results": [
     {
       "item": "ae2:certus_quartz_crystal"
     },
     {
-      "item": "ae2:certus_quartz_dust",
-      "count": 4
+      "count": 4,
+      "item": "ae2:certus_quartz_dust"
     },
     {
-      "item": "ae2:certus_quartz_dust",
-      "chance": 0.5
+      "chance": 0.5,
+      "item": "ae2:certus_quartz_dust"
     },
     {
-      "item": "minecraft:cobbled_deepslate",
-      "chance": 0.125
-    }
-  ],
-  "processingTime": 300,
-  "fabric:load_conditions": [
-    {
-      "condition": "fabric:all_mods_loaded",
-      "values": [
-        "ae2"
-      ]
+      "chance": 0.125,
+      "item": "minecraft:cobbled_deepslate"
     }
   ]
 }