Merge branch 'mc1.19/fabric/dev' into mc1.20.1/fabric/dev

# Conflicts:
#	FABRIC_CHANGELOG.txt
#	src/generated/resources/.cache/1befec8d6a93075ce6b4cde2ad591d86e1289c0e
#	src/generated/resources/.cache/35806e87dccf1c56c630455071f2d6dfd38015f6
#	src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9
#	src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba
#	src/generated/resources/.cache/5941507bfa52efb23b73a8b0f1a97554e2aada1d
#	src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
#	src/generated/resources/.cache/8374d11e7b3d6ea1837e31911da1439b12da9432
#	src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0
#	src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java
#	src/main/resources/fabric.mod.json

Author: TropheusJ

FABRIC_CHANGELOG.txt

@@ -5,3 +5,4 @@ No formatting, just plain text. CurseForge support for it is terrible.
 
 Change logging starts below:
 ----------
+- Fixed several incorrect tags and missing tag lang

src/generated/resources/assets/create/lang/en_ud.json

@@ -2977,6 +2977,7 @@
   "tag.c.chocolate": "ǝʇɐןoɔoɥƆ",
   "tag.c.copper_plates": "sǝʇɐןԀ ɹǝddoƆ",
   "tag.c.dough": "ɥbnoᗡ",
+  "tag.c.dusts.obsidian": "sʇsnᗡ uɐıpısqO",
   "tag.c.flour": "ɹnoןℲ",
   "tag.c.gold_plates": "sǝʇɐןԀ pןo⅁",
   "tag.c.helmets": "sʇǝɯןǝH",
@@ -3019,6 +3020,9 @@
   "tag.create.stone_types.deepslate": "ǝʇɐןsdǝǝᗡ",
   "tag.create.stone_types.diorite": "ǝʇıɹoıᗡ",
   "tag.create.stone_types.dripstone": "ǝuoʇsdıɹᗡ",
+  "tag.create.stone_types.galosphere.allurite": "ǝʇıɹnןןⱯ",
+  "tag.create.stone_types.galosphere.amethyst": "ʇsʎɥʇǝɯⱯ",
+  "tag.create.stone_types.galosphere.lumiere": "ǝɹǝıɯnꞀ",
   "tag.create.stone_types.granite": "ǝʇıuɐɹ⅁",
   "tag.create.stone_types.limestone": "ǝuoʇsǝɯıꞀ",
   "tag.create.stone_types.ochrum": "ɯnɹɥɔO",
@@ -3027,6 +3031,8 @@
   "tag.create.stone_types.tuff": "ɟɟn⟘",
   "tag.create.stone_types.veridium": "ɯnıpıɹǝΛ",
   "tag.create.toolboxes": "sǝxoqןoo⟘",
+  "tag.create.tracks": "sʞɔɐɹ⟘",
+  "tag.create.upgrade_aquatic.coral": "ןɐɹoƆ",
   "tag.create.valve_handles": "sǝןpuɐH ǝʌןɐΛ",
   "tag.create.vanilla_stripped_logs": "sboꞀ pǝddıɹʇS ɐןןıuɐΛ",
   "tag.create.vanilla_stripped_wood": "pooM pǝddıɹʇS ɐןןıuɐΛ"

src/generated/resources/assets/create/lang/en_us.json

@@ -2977,6 +2977,7 @@
   "tag.c.chocolate": "Chocolate",
   "tag.c.copper_plates": "Copper Plates",
   "tag.c.dough": "Dough",
+  "tag.c.dusts.obsidian": "Obsidian Dusts",
   "tag.c.flour": "Flour",
   "tag.c.gold_plates": "Gold Plates",
   "tag.c.helmets": "Helmets",
@@ -3019,6 +3020,9 @@
   "tag.create.stone_types.deepslate": "Deepslate",
   "tag.create.stone_types.diorite": "Diorite",
   "tag.create.stone_types.dripstone": "Dripstone",
+  "tag.create.stone_types.galosphere.allurite": "Allurite",
+  "tag.create.stone_types.galosphere.amethyst": "Amethyst",
+  "tag.create.stone_types.galosphere.lumiere": "Lumiere",
   "tag.create.stone_types.granite": "Granite",
   "tag.create.stone_types.limestone": "Limestone",
   "tag.create.stone_types.ochrum": "Ochrum",
@@ -3027,6 +3031,8 @@
   "tag.create.stone_types.tuff": "Tuff",
   "tag.create.stone_types.veridium": "Veridium",
   "tag.create.toolboxes": "Toolboxes",
+  "tag.create.tracks": "Tracks",
+  "tag.create.upgrade_aquatic.coral": "Coral",
   "tag.create.valve_handles": "Valve Handles",
   "tag.create.vanilla_stripped_logs": "Vanilla Stripped Logs",
   "tag.create.vanilla_stripped_wood": "Vanilla Stripped Wood"

src/generated/resources/data/create/recipes/crafting/kinetics/copper_valve_handle.json

@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "C": {
-      "tag": "c:plates/copper"
+      "tag": "c:copper_plates"
     },
     "S": {
       "item": "create:andesite_alloy"

src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe.json

@@ -6,7 +6,7 @@
       "tag": "c:copper_ingots"
     },
     "S": {
-      "tag": "c:plates/copper"
+      "tag": "c:copper_plates"
     }
   },
   "pattern": [

src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe_vertical.json

@@ -6,7 +6,7 @@
       "tag": "c:copper_ingots"
     },
     "S": {
-      "tag": "c:plates/copper"
+      "tag": "c:copper_plates"
     }
   },
   "pattern": [

src/generated/resources/data/create/recipes/crafting/kinetics/fluid_tank.json

@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "B": {
-      "tag": "c:plates/copper"
+      "tag": "c:copper_plates"
     },
     "C": {
       "tag": "c:wooden_barrels"

src/generated/resources/data/create/recipes/crafting/kinetics/hose_pulley.json

@@ -9,7 +9,7 @@
       "item": "minecraft:dried_kelp_block"
     },
     "I": {
-      "tag": "c:plates/copper"
+      "tag": "c:copper_plates"
     }
   },
   "pattern": [

src/generated/resources/data/create/recipes/crafting/logistics/display_link.json

@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "A": {
-      "tag": "c:plates/copper"
+      "tag": "c:copper_plates"
     },
     "C": {
       "item": "minecraft:redstone_torch"

src/generated/resources/data/create/recipes/crushing/compat/byg/ametrine_ore.json

@@ -10,7 +10,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "forge:ores/ametrine"
+      "tag": "c:ores/ametrine"
     }
   ],
   "processingTime": 500,

src/generated/resources/data/create/recipes/crushing/compat/byg/anthracite_ore.json

@@ -10,7 +10,7 @@
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "forge:ores/anthracite"
+      "tag": "c:ores/anthracite"
     }
   ],
   "processingTime": 150,

src/generated/resources/data/create/recipes/crushing/raw_aluminum.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/aluminum"
+        "c:raw_aluminum"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/aluminum"
+      "tag": "c:raw_aluminum"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_aluminum_block.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:storage_blocks/raw_aluminum"
+        "c:raw_aluminum_blocks"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:storage_blocks/raw_aluminum"
+      "tag": "c:raw_aluminum_blocks"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_lead.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/lead"
+        "c:raw_lead"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/lead"
+      "tag": "c:raw_lead"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_lead_block.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:storage_blocks/raw_lead"
+        "c:raw_lead_blocks"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:storage_blocks/raw_lead"
+      "tag": "c:raw_lead_blocks"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_nickel.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/nickel"
+        "c:raw_nickel"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/nickel"
+      "tag": "c:raw_nickel"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_nickel_block.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:storage_blocks/raw_nickel"
+        "c:raw_nickel_blocks"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:storage_blocks/raw_nickel"
+      "tag": "c:raw_nickel_blocks"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_osmium.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/osmium"
+        "c:raw_osmium"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/osmium"
+      "tag": "c:raw_osmium"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_osmium_block.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:storage_blocks/raw_osmium"
+        "c:raw_osmium_blocks"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:storage_blocks/raw_osmium"
+      "tag": "c:raw_osmium_blocks"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_platinum.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/platinum"
+        "c:raw_platinum"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/platinum"
+      "tag": "c:raw_platinum"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_platinum_block.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:storage_blocks/raw_platinum"
+        "c:raw_platinum_blocks"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:storage_blocks/raw_platinum"
+      "tag": "c:raw_platinum_blocks"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_quicksilver.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/quicksilver"
+        "c:raw_quicksilver"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/quicksilver"
+      "tag": "c:raw_quicksilver"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_quicksilver_block.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:storage_blocks/raw_quicksilver"
+        "c:raw_quicksilver_blocks"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:storage_blocks/raw_quicksilver"
+      "tag": "c:raw_quicksilver_blocks"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_silver.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/silver"
+        "c:raw_silver"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/silver"
+      "tag": "c:raw_silver"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_silver_block.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:storage_blocks/raw_silver"
+        "c:raw_silver_blocks"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:storage_blocks/raw_silver"
+      "tag": "c:raw_silver_blocks"
     }
   ],
   "processingTime": 400,

src/generated/resources/data/create/recipes/crushing/raw_tin.json

@@ -3,14 +3,14 @@
     {
       "condition": "fabric:tags_populated",
       "values": [
-        "c:raw_materials/tin"
+        "c:raw_tin"
       ]
     }
   ],
   "type": "create:crushing",
   "ingredients": [
     {
-      "tag": "c:raw_materials/tin"
+      "tag": "c:raw_tin"
     }
   ],
   "processingTime": 400,