Merge branch 'mc1.20.1/dev' into mc1.20.1/train_map_integration

IThundxr · Sep 3, 2024 · 86ceb9e · 86ceb9e
2 parents 97205a7 + b6856bd
commit 86ceb9e
Show file tree

Hide file tree

Showing 119 changed files with 3,345 additions and 946 deletions.
diff --git a/.github/workflows/localization.yml b/.github/workflows/localization.yml
@@ -41,7 +41,7 @@ jobs:
                   create_pull_request: true
                   pull_request_title: 'New Crowdin translations'
                   pull_request_body: 'New Crowdin pull request with translations'
-                  pull_request_base_branch_name: 'mc1.18/dev'
+                  pull_request_base_branch_name: 'mc1.20.1/dev'
               env:
                   GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
                   CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}

diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ use_parchment = true
 # dependency versions
 registrate_version = MC1.20-1.3.3
 flywheel_minecraft_version = 1.20.1
-flywheel_version = 0.6.10-11
+flywheel_version = 0.6.11-13
 jei_minecraft_version = 1.20.1
 jei_version = 15.10.0.39
 curios_minecraft_version = 1.20.1

diff --git a/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa b/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa
@@ -1,4 +1,4 @@
-// 1.20.1	2024-08-08T08:37:57.8073953	Create's Sequenced Assembly Recipes
+// 1.20.1	2024-09-02T22:36:27.3560692	Create's Sequenced Assembly Recipes
 dbaca5a5aa312f3bc7b826e51e665d32e798a5d7 data/create/recipes/sequenced_assembly/precision_mechanism.json
 dacafdb106304d183b00e21fb01517ac45eca800 data/create/recipes/sequenced_assembly/sturdy_sheet.json
 1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json
diff --git a/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba b/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba
@@ -1,4 +1,4 @@
-// 1.20.1	2024-08-08T08:37:57.7024448	Create's Advancements
+// 1.20.1	2024-09-02T22:36:27.2861383	Create's Advancements
 2661a689fdcf729494f46e3c719f71c62e31582e data/create/advancements/andesite_alloy.json
 fa16c4afe0496edc3f157858a6e0ff177a1622ff data/create/advancements/andesite_casing.json
 5a694002d0a663bc869b09d15924a10c43dc522f data/create/advancements/anvil_plough.json

diff --git a/src/generated/resources/.cache/499d9d953ee69b539ff4dd4c95a6cbd849f63f67 b/src/generated/resources/.cache/499d9d953ee69b539ff4dd4c95a6cbd849f63f67
@@ -1,4 +1,4 @@
-// 1.20.1	2024-08-08T08:37:57.7044344	Create Train Hat Information
+// 1.20.1	2024-09-02T22:36:27.2891201	Create Train Hat Information
 be16d47aa64e673b1107a36ce06475016e316fca assets/minecraft/train_hat_info/axolotl.json
 b8ae6d9c8014439f4049622e0d6e79b9d6716260 assets/minecraft/train_hat_info/bat.json
 5053a6c9fb412dfac1bf17eb0f57f9fd314198e4 assets/minecraft/train_hat_info/bee.json

diff --git a/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 b/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9
@@ -1,5 +1,5 @@
-// 1.20.1	2024-08-08T08:37:57.8113843	Create's Mechanical Crafting Recipes
+// 1.20.1	2024-09-02T22:36:27.3630513	Create's Mechanical Crafting Recipes
 f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json
 694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json
-3b2837b08607c1ca466fa3eb418209b2e55da6ba data/create/recipes/mechanical_crafting/potato_cannon.json
+c03bc27f537e2d6531438bf58a17d977a7e16c7b data/create/recipes/mechanical_crafting/potato_cannon.json
 fee8df727370175f5bf42584c981edaf8fd58ac8 data/create/recipes/mechanical_crafting/wand_of_symmetry.json
diff --git a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
diff --git a/src/generated/resources/.cache/ad9bf59631726a3f24738ebf1a6cd44c7f88ba0f b/src/generated/resources/.cache/ad9bf59631726a3f24738ebf1a6cd44c7f88ba0f
@@ -1,4 +1,4 @@
-// 1.20.1	2024-08-08T08:37:57.806398	Create's Damage Type Tags
+// 1.20.1	2024-09-02T22:36:27.3560692	Create's Damage Type Tags
 7884716b2f4bb1330ff215366bb4bab06e4728c2 data/minecraft/tags/damage_type/bypasses_armor.json
 1fcad1f89265fba8bdb05b03a1dfcc88d7b7a550 data/minecraft/tags/damage_type/is_explosion.json
 08324c61115b72bb8a6370d7f34d84d9a31afd16 data/minecraft/tags/damage_type/is_fire.json
diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
@@ -1,4 +1,4 @@
-// 1.20.1	2024-08-11T21:50:05.4469007	Create's Processing Recipes
+// 1.20.1	2024-09-02T22:36:27.2901169	Create's Processing Recipes
 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json
@@ -117,32 +117,32 @@ d3534d606382ec7c1d34275c5f069543d0955906 data/create/recipes/crushing/nickel_ore
 d391ef171a3ece91ae72697ceba36b71b19f4fae data/create/recipes/crushing/platinum_ore.json
 acb785fd57d14ac337beacc0a0a0651d75dd45da data/create/recipes/crushing/prismarine_crystals.json
 1126e9f29bf15c56917168d53e9f533c171ad2fb data/create/recipes/crushing/quicksilver_ore.json
+00c7c3bc45245749ad7cc4ba3ae4b1958bd6bab7 data/create/recipes/crushing/raw_aluminum.json
 a0a9e118317e2aabdafc94d19dedb05ccc751630 data/create/recipes/crushing/raw_aluminum_block.json
-00c7c3bc45245749ad7cc4ba3ae4b1958bd6bab7 data/create/recipes/crushing/raw_aluminum_ore.json
-b490b3ef4f62e2d225c82693955f9a3e70a33e32 data/create/recipes/crushing/raw_copper.json
-efa4c84119f0aa998a6b3f477884f81b28d8bd91 data/create/recipes/crushing/raw_copper_block.json
-26577895a8ac3c61187171784c5aa30d334ddc17 data/create/recipes/crushing/raw_gold.json
-94606b52a715c2118afa63d0df4791167ec78570 data/create/recipes/crushing/raw_gold_block.json
-f48f8f1702697f04f420008a002561a96087d424 data/create/recipes/crushing/raw_iron.json
-f77190f83190cb0491d77c79f618c7ecb1169dd9 data/create/recipes/crushing/raw_iron_block.json
+b798b65bfd6cb36659d5a066207ccc8dfbb018f6 data/create/recipes/crushing/raw_copper.json
+792c59071020e56c730f0c56d533be7e387aa8a0 data/create/recipes/crushing/raw_copper_block.json
+d5e4dc9ffe659d36310e1a834b30d18fb7759ce4 data/create/recipes/crushing/raw_gold.json
+2ece4b609f585dee6eaf68d50f242912bf8b5c63 data/create/recipes/crushing/raw_gold_block.json
+5fe12a645e6a6ee296c90d81f02047251008a8ac data/create/recipes/crushing/raw_iron.json
+26fb3284ca7c9241f309dc8b8cbdbda9ad8c8b3c data/create/recipes/crushing/raw_iron_block.json
+8bcbe26c99259814cda03c7e702cb2b9cdb703be data/create/recipes/crushing/raw_lead.json
 bb958be3f923c7b921b1fe4e1fffaf612313bc3b data/create/recipes/crushing/raw_lead_block.json
-8bcbe26c99259814cda03c7e702cb2b9cdb703be data/create/recipes/crushing/raw_lead_ore.json
+fe4987e15391a89865021c8ffc39f552d972ce6c data/create/recipes/crushing/raw_nickel.json
 b32aeba202cb46ca597c45b321df087629b0d529 data/create/recipes/crushing/raw_nickel_block.json
-fe4987e15391a89865021c8ffc39f552d972ce6c data/create/recipes/crushing/raw_nickel_ore.json
+f170312878e061b588780f694b3069b07c6a9145 data/create/recipes/crushing/raw_osmium.json
 ba9ac5dac3bebb11ca29c31da6929c1e4bc42a82 data/create/recipes/crushing/raw_osmium_block.json
-f170312878e061b588780f694b3069b07c6a9145 data/create/recipes/crushing/raw_osmium_ore.json
+948c8d58b5ff186e1a6822ea30310f8fb2d04c0a data/create/recipes/crushing/raw_platinum.json
 7862c43aeabec2ce7f9c57237f12cb1e57ba19f3 data/create/recipes/crushing/raw_platinum_block.json
-948c8d58b5ff186e1a6822ea30310f8fb2d04c0a data/create/recipes/crushing/raw_platinum_ore.json
+a47988609aa65204f28a08f92330947264bae99c data/create/recipes/crushing/raw_quicksilver.json
 44f93dc5967c395116f2f88440b6551ae37492fd data/create/recipes/crushing/raw_quicksilver_block.json
-a47988609aa65204f28a08f92330947264bae99c data/create/recipes/crushing/raw_quicksilver_ore.json
+c76409d69a9639c32bd95988bc6ae937d2b9ab3d data/create/recipes/crushing/raw_silver.json
 edb7cd8356c53e9d6c26385e7daba2477d1c0fc3 data/create/recipes/crushing/raw_silver_block.json
-c76409d69a9639c32bd95988bc6ae937d2b9ab3d data/create/recipes/crushing/raw_silver_ore.json
+1416215d01c218bcf9138368237ad49a7e3401f7 data/create/recipes/crushing/raw_tin.json
 7a7aebffec77b5735ff94b36ea7d624012129b36 data/create/recipes/crushing/raw_tin_block.json
-1416215d01c218bcf9138368237ad49a7e3401f7 data/create/recipes/crushing/raw_tin_ore.json
+4614b1f29655509da43e7b9bf0b2dc25c1a5968e data/create/recipes/crushing/raw_uranium.json
 537963e4b7d514c6829091f80454d3722cdc1b66 data/create/recipes/crushing/raw_uranium_block.json
-4614b1f29655509da43e7b9bf0b2dc25c1a5968e data/create/recipes/crushing/raw_uranium_ore.json
-29b1755e48b902c1123eafa75a8fa00325bd3b8b data/create/recipes/crushing/raw_zinc.json
-79775097db26ca297b8b1ab1b0f6a1666df0c39e data/create/recipes/crushing/raw_zinc_block.json
+86b1ea5c26fa49af78d5fa38b7a29a451b862b0f data/create/recipes/crushing/raw_zinc.json
+66c25b21126921863e4f6b28115ba3be00ae4ee0 data/create/recipes/crushing/raw_zinc_block.json
 268f64d9d7f99e12d0a8228d3455c70e436ebd7f data/create/recipes/crushing/redstone_ore.json
 6ae95e2551fe11bceea7f473c04b158c0518508e data/create/recipes/crushing/silver_ore.json
 caffc0003ad99160c866ee0e71a345dbe7f696b2 data/create/recipes/crushing/tin_ore.json
@@ -754,8 +754,8 @@ b18c81c17d395fb6e9291fc010576914000f069d data/create/recipes/haunting/warped_fun
 4816a96aa0117b826ec01f9351c98eaec4e132fd data/create/recipes/item_application/andesite_casing_from_wood.json
 ac734bd72012ab3f0fd362fdcf237191874e1eae data/create/recipes/item_application/brass_casing_from_log.json
 df1d95a4e41fb01d0ac240f89dcf734e00d92853 data/create/recipes/item_application/brass_casing_from_wood.json
-e9a1683091c56c762a5509c31658593cd4cf2b6b data/create/recipes/item_application/copper_casing_from_log.json
-66589dac860c8f248f1ca3704698d984793763c6 data/create/recipes/item_application/copper_casing_from_wood.json
+a9e164ba47552af7df82f011080d981420388bc6 data/create/recipes/item_application/copper_casing_from_log.json
+92e97bf5e88f73d1320f30af95a90f58ceb58877 data/create/recipes/item_application/copper_casing_from_wood.json
 d8a741b87c14ab45d7f32a8f569c3f874b3a3076 data/create/recipes/item_application/railway_casing.json
 9336b8b9f590ed993fd88c8707b57d845a5aa115 data/create/recipes/milling/allium.json
 d480b1b4c48440c6d6cb775321e95be7ea171aa5 data/create/recipes/milling/andesite.json
@@ -967,7 +967,7 @@ a91dae829938d3f69a7007d3cf8db02b70fe3a7f data/create/recipes/milling/white_tulip
 74bb289e20e891112f4964761eb76c3ce4d3c8cd data/create/recipes/milling/wool.json
 5f1b8a82af091cd4589ecfa5c13a4db6ad9c51b9 data/create/recipes/mixing/andesite_alloy.json
 48604c2205b18fe1401eac58d14aa1677cbd9c2b data/create/recipes/mixing/andesite_alloy_from_zinc.json
-b8dfa0e65b356e88f264ac4ee95672e0afc5961c data/create/recipes/mixing/brass_ingot.json
+d06c1d0362dccc4e5f8b22f851dc8316b35c06b0 data/create/recipes/mixing/brass_ingot.json
 840a9008d4531425beadfcf224d21e938acc4502 data/create/recipes/mixing/chocolate.json
 e7b86d4ca5de2df474794424d93b447e5f9dcdc3 data/create/recipes/mixing/chocolate_melting.json
 39e832016fa5e360434271505d09ced17a40e7eb data/create/recipes/mixing/compat/ae2/fluix_crystal.json
@@ -998,7 +998,7 @@ ed3edcf493402051fcff435a5840295b218a078c data/create/recipes/pressing/compat/env
 621f9c7eae4f6f5065ecd48ffe1b0c5c9e6147d3 data/create/recipes/pressing/compat/infernalexp/soul_soil_path.json
 e049a1c6951c93a53122fc5adb27bee35ca62786 data/create/recipes/pressing/compat/infernalexp/warped_nylium_path.json
 955613e743a216b10d54f94b89b23166adb49a40 data/create/recipes/pressing/compat/vampirism/cursed_earth_path.json
-8dee39f86784636639790b0ed1bbd5c845522952 data/create/recipes/pressing/copper_ingot.json
+4ce4f4b71058d04be148cc2ad2318abe27a58359 data/create/recipes/pressing/copper_ingot.json
 24bb356954866c69a279a9f0435035d8bafdddec data/create/recipes/pressing/cursed_earth_path_from_grass.json
 744e1a66857f20a094ba02a3e3613210a815493e data/create/recipes/pressing/gold_ingot.json
 fb105ac920ce9dc0b883bfa40029b69709bceb38 data/create/recipes/pressing/iron_ingot.json

diff --git a/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 b/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139
@@ -1,2 +1,2 @@
-// 1.20.1	2024-08-08T08:37:57.7244288	Create's Custom Sounds
+// 1.20.1	2024-09-02T22:36:27.3041196	Create's Custom Sounds
 bcfd9320f8ed54f3282b1757a41da0d1753e1754 assets/create/sounds.json
diff --git a/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 b/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95
@@ -1,2 +1,2 @@
-// 1.20.1	2024-08-08T08:37:57.806398	Create's Recipe Serializer Tags
+// 1.20.1	2024-09-02T22:36:27.3550723	Create's Recipe Serializer Tags
 0d8718f7383761bc5d7bc45306ed266ebf25dc1d data/create/tags/recipe_serializer/automation_ignore.json
diff --git a/src/generated/resources/.cache/eaed56ca9d9781c7626be345dd9f2c9a1fad638e b/src/generated/resources/.cache/eaed56ca9d9781c7626be345dd9f2c9a1fad638e
@@ -1,4 +1,4 @@
-// 1.20.1	2024-08-08T08:37:57.8083923	Create's Generated Registry Entries
+// 1.20.1	2024-09-02T22:36:27.3570669	Create's Generated Registry Entries
 030ede1044384c4117ac1e491bf5c78bbd2842f5 data/create/damage_type/crush.json
 92b0416950ffeb3ba68811e587177c2f8811c2c5 data/create/damage_type/cuckoo_surprise.json
 d2a4fdb64f4ba817e13a7b20c73fd1ca34b825fc data/create/damage_type/fan_fire.json

diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json
@@ -1946,7 +1946,7 @@
   "create.ponder.redstone_link.text_1": "ʎןssǝןǝɹıʍ sןɐubıs ǝuoʇspǝɹ ʇıɯsuɐɹʇ uɐɔ sʞuıꞀ ǝuoʇspǝᴚ",
   "create.ponder.redstone_link.text_2": "ǝpoɯ ǝʌıǝɔǝɹ ǝןbboʇ oʇ buıʞɐǝuS ǝןıɥʍ ʞɔıןɔ-ʇɥbıᴚ",
   "create.ponder.redstone_link.text_3": "ǝɯɐs ǝɥʇ op uɐɔ ɥɔuǝɹM ɐ ɥʇıʍ ʞɔıןɔ-ʇɥbıᴚ ǝןdɯıs Ɐ",
-  "create.ponder.redstone_link.text_4": "sʞɔoןq 8ᄅƖ uıɥʇıʍ sɹǝʇʇıɯsuɐɹʇ ɟo ɹǝʍod ǝuoʇspǝɹ ǝɥʇ ʇıɯǝ sɹǝʌıǝɔǝᴚ",
+  "create.ponder.redstone_link.text_4": "sʞɔoןq 9ϛᄅ uıɥʇıʍ sɹǝʇʇıɯsuɐɹʇ ɟo ɹǝʍod ǝuoʇspǝɹ ǝɥʇ ʇıɯǝ sɹǝʌıǝɔǝᴚ",
   "create.ponder.redstone_link.text_5": "ʎɔuǝnbǝɹℲ ɐ ʎɟıɔǝds uɐɔ sʇoןs oʍʇ ǝɥʇ uı sɯǝʇı buıɔɐןԀ",
   "create.ponder.redstone_link.text_6": "ǝʇɐɔıunɯɯoɔ ןןıʍ sǝıɔuǝnbǝɹℲ buıɥɔʇɐɯ ɥʇıʍ sʞuıן ǝɥʇ ʎןuO",
   "create.ponder.replay": "ʎɐןdǝᴚ",

diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json
@@ -1946,7 +1946,7 @@
   "create.ponder.redstone_link.text_1": "Redstone Links can transmit redstone signals wirelessly",
   "create.ponder.redstone_link.text_2": "Right-click while Sneaking to toggle receive mode",
   "create.ponder.redstone_link.text_3": "A simple Right-click with a Wrench can do the same",
-  "create.ponder.redstone_link.text_4": "Receivers emit the redstone power of transmitters within 128 blocks",
+  "create.ponder.redstone_link.text_4": "Receivers emit the redstone power of transmitters within 256 blocks",
   "create.ponder.redstone_link.text_5": "Placing items in the two slots can specify a Frequency",
   "create.ponder.redstone_link.text_6": "Only the links with matching Frequencies will communicate",
   "create.ponder.replay": "Replay",

diff --git a/...ted/resources/data/create/advancements/recipes/misc/blasting/zinc_ingot_from_raw_ore.json b/...ted/resources/data/create/advancements/recipes/misc/blasting/zinc_ingot_from_raw_ore.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "create:raw_zinc"
-            ]
+            "tag": "forge:raw_materials/zinc"
           }
         ]
       },

diff --git a/.../resources/data/create/advancements/recipes/misc/crafting/appliances/copper_backtank.json b/.../resources/data/create/advancements/recipes/misc/crafting/appliances/copper_backtank.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...ources/data/create/advancements/recipes/misc/crafting/appliances/copper_diving_boots.json b/...ources/data/create/advancements/recipes/misc/crafting/appliances/copper_diving_boots.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...urces/data/create/advancements/recipes/misc/crafting/appliances/copper_diving_helmet.json b/...urces/data/create/advancements/recipes/misc/crafting/appliances/copper_diving_helmet.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...esources/data/create/advancements/recipes/misc/crafting/kinetics/copper_valve_handle.json b/...esources/data/create/advancements/recipes/misc/crafting/kinetics/copper_valve_handle.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...a/create/advancements/recipes/misc/crafting/kinetics/copper_valve_handle_from_others.json b/...a/create/advancements/recipes/misc/crafting/kinetics/copper_valve_handle_from_others.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...nerated/resources/data/create/advancements/recipes/misc/crafting/kinetics/fluid_pipe.json b/...nerated/resources/data/create/advancements/recipes/misc/crafting/kinetics/fluid_pipe.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...esources/data/create/advancements/recipes/misc/crafting/kinetics/fluid_pipe_vertical.json b/...esources/data/create/advancements/recipes/misc/crafting/kinetics/fluid_pipe_vertical.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...erated/resources/data/create/advancements/recipes/misc/crafting/kinetics/fluid_valve.json b/...erated/resources/data/create/advancements/recipes/misc/crafting/kinetics/fluid_valve.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...erated/resources/data/create/advancements/recipes/misc/crafting/kinetics/hose_pulley.json b/...erated/resources/data/create/advancements/recipes/misc/crafting/kinetics/hose_pulley.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...ed/resources/data/create/advancements/recipes/misc/crafting/kinetics/mechanical_pump.json b/...ed/resources/data/create/advancements/recipes/misc/crafting/kinetics/mechanical_pump.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...d/resources/data/create/advancements/recipes/misc/crafting/kinetics/smart_fluid_pipe.json b/...d/resources/data/create/advancements/recipes/misc/crafting/kinetics/smart_fluid_pipe.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...rated/resources/data/create/advancements/recipes/misc/crafting/kinetics/steam_engine.json b/...rated/resources/data/create/advancements/recipes/misc/crafting/kinetics/steam_engine.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...ated/resources/data/create/advancements/recipes/misc/crafting/kinetics/steam_whistle.json b/...ated/resources/data/create/advancements/recipes/misc/crafting/kinetics/steam_whistle.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...ated/resources/data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json b/...ated/resources/data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "create:copper_nugget"
-            ]
+            "tag": "forge:nuggets/copper"
           }
         ]
       },

diff --git a/...ted/resources/data/create/advancements/recipes/misc/crafting/materials/copper_nugget.json b/...ted/resources/data/create/advancements/recipes/misc/crafting/materials/copper_nugget.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:copper_ingot"
-            ]
+            "tag": "forge:ingots/copper"
           }
         ]
       },

diff --git a/...ted/resources/data/create/advancements/recipes/misc/smelting/zinc_ingot_from_raw_ore.json b/...ted/resources/data/create/advancements/recipes/misc/smelting/zinc_ingot_from_raw_ore.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "create:raw_zinc"
-            ]
+            "tag": "forge:raw_materials/zinc"
           }
         ]
       },

diff --git a/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_raw_ore.json b/src/generated/resources/data/create/recipes/blasting/zinc_ingot_from_raw_ore.json
@@ -4,7 +4,7 @@
   "cookingtime": 100,
   "experience": 0.7,
   "ingredient": {
-    "item": "create:raw_zinc"
+    "tag": "forge:raw_materials/zinc"
   },
   "result": "create:zinc_ingot"
 }
diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json b/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json
@@ -6,13 +6,13 @@
       "item": "create:andesite_alloy"
     },
     "B": {
-      "item": "minecraft:copper_block"
+      "tag": "forge:storage_blocks/copper"
     },
     "G": {
       "item": "create:shaft"
     },
     "P": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_boots.json b/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_boots.json
@@ -6,7 +6,7 @@
       "item": "create:andesite_alloy"
     },
     "P": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "pattern": [

diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_helmet.json b/src/generated/resources/data/create/recipes/crafting/appliances/copper_diving_helmet.json
@@ -6,7 +6,7 @@
       "tag": "forge:glass"
     },
     "P": {
-      "item": "minecraft:copper_ingot"
+      "tag": "forge:ingots/copper"
     }
   },
   "pattern": [