icon work, more models

assets/common/items/mineral/ore/coal.ron

@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Coal",
+    description: "A dark, combustible energy source.",
+    kind: Ingredient(
+        kind: "Coal",
+    ),
+    quality: Common,
+    tags: [],
+)

assets/common/loot_tables/creature/quad_low/venemous.ron

@@ -1,5 +1,5 @@
 [
     (1.0, Item("common.items.food.meat.tough_raw")),
-    (2.0, Item("common.items.crafting_ing.animal_misc.venomsac")),
+    (2.0, Item("common.items.crafting_ing.animal_misc.venom_sac")),
     (2.0, Item("common.items.crafting_ing.hide.scales")),
 ]

assets/common/recipe_book.ron

@@ -170,20 +170,131 @@
         ],
         craft_sprite: Some(CookingPot),
     ),
-    "simple_leather": (
+    "simple leather": (
         output: ("common.items.crafting_ing.leather.simple_leather", 1),
         inputs: [
             (Item("common.items.crafting_ing.hide.animal_hide"), 1),
         ],
         craft_sprite: Some(CraftingBench),
     ),
-    "thick_leather": (
+    "thick leather": (
         output: ("common.items.crafting_ing.leather.thick_leather", 1),
         inputs: [
             (Item("common.items.crafting_ing.hide.tough_hide"), 1),
         ],
         craft_sprite: Some(CraftingBench),
     ),
+    "gold ingot": (
+        output: ("common.items.mineral.ingot.gold", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold_ore"), 1),
+        ],	
+        craft_sprite: Some(CraftingBench),
+    ),
+    "silver ingot": (
+        output: ("common.items.mineral.ingot.silver", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.silver_ore"), 1),
+        ],	
+        craft_sprite: Some(CraftingBench),
+    ),
+
+    "iron ingot": (
+        output: ("common.items.mineral.ingot.iron", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.iron_ore"), 1),
+        ],	
+        craft_sprite: Some(CraftingBench),
+    ),
+    "cobalt ingot": (
+        output: ("common.items.mineral.ingot.cobalt", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.cobalt_ore"), 1),
+        ],	
+        craft_sprite: Some(CraftingBench),
+    ),
+    "tin ingot": (
+        output: ("common.items.mineral.ingot.tin", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.tin_ore"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "orichalcum ingot": (
+        output: ("common.items.mineral.ingot.orichalcum", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.gold_ore"), 1),
+            (Item("common.items.mineral.ore.silver_ore"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "copper ingot": (
+        output: ("common.items.mineral.ingot.copper", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.copper_ore"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "bloodsteel ingot": (
+        output: ("common.items.mineral.ingot.bloodsteel", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.bloodstone_ore"), 1),
+            (Item("common.items.mineral.ore.iron_ore"), 1),  
+            (Item("common.items.mineral.ore.coal"), 1),  
+      ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "steel ingot": (
+        output: ("common.items.mineral.ingot.steel", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.iron_ore"), 1),  
+            (Item("common.items.mineral.ore.coal"), 1),  
+      ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "bronze ingot": (
+        output: ("common.items.mineral.ingot.bronze", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.copper_ore"), 1),
+            (Item("common.items.mineral.ore.tin_ore"), 1),
+        ],	
+        craft_sprite: Some(CraftingBench),
+    ),
+    "linen": (
+        output: ("common.items.crafting_ing.cloth.linen", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.plant_fiber"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "silk": (
+        output: ("common.items.crafting_ing.cloth.silk", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.sticky_thread"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "lifecloth": (
+        output: ("common.items.crafting_ing.cloth.lifecloth", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "moonweave": (
+        output: ("common.items.crafting_ing.cloth.moonweave", 1),
+        inputs: [
+            (Item("common.items.flowers.moonbell"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
+    "sunsilk": (
+        output: ("common.items.crafting_ing.cloth.sunsilk", 1),
+        inputs: [
+            (Item("common.items.flowers.pyrebloom"), 1),
+        ],		
+        craft_sprite: Some(CraftingBench),
+    ),
     "salad_plain": (
         output: ("common.items.food.plainsalad", 1),
         inputs: [

assets/voxygen/item_image_manifest.ron

@@ -1250,56 +1250,6 @@
         "voxel.armor.leather_plate.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    //Leather0 Armor
-    Armor(Chest("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.chest",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Pants("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.pants",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Belt("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.belt",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
-    ),
-    Armor(Foot("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.foot",
-        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
-    ),
-    Armor(Hand("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.hand",
-        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
-    ),
-    Armor(Shoulder("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.shoulder",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
-    //Rawhide Armor
-    Armor(Chest("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.chest",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Pants("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.pants",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Belt("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.belt",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
-    ),
-    Armor(Foot("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.foot",
-        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
-    ),
-    Armor(Hand("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.hand",
-        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
-    ),
-    Armor(Shoulder("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.shoulder",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
     //Ferocious Armor
     Armor(Chest("Ferocious")): VoxTrans(
         "voxel.armor.ferocious.chest",
@@ -1620,6 +1570,64 @@
         "voxel.armor.warlock.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
+    //Rawhide Set
+    Armor(Chest("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.chest",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.pants",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.belt",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+    ),
+    Armor(Foot("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.foot",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.hand",
+        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.shoulder",
+        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+    ),
+    Armor(Back("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.back",
+        (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
+    //Leather set
+    Armor(Chest("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.chest",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.pants",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.belt",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
+    ),
+    Armor(Foot("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.foot",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.hand",
+        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.shoulder",
+        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+    ),
+    Armor(Back("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.back",
+        (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    ),
     //Scale Set
     Armor(Chest("Scale")): VoxTrans(
         "voxel.armor.hide.scale.chest",
@@ -2135,10 +2143,6 @@
         "voxel.armor.misc.back.dungeon_purple",
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    Armor(Back("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.back",
-        (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
-    ),
     Armor(Back("LeatherBlue")): VoxTrans(
         "voxel.armor.leather_blue.back",
         (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
@@ -2441,45 +2445,129 @@
         "voxel.sprite.crafting_ing.leather.leather_strips",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
+    Ingredient("Plate"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.plate",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0,
+    ),
+    Ingredient("Carapace"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.carapace",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("Scale"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.scale",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("DragonScale"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.dragon_scale",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
     Ingredient("Claw"): VoxTrans(
         "voxel.sprite.crafting_ing.claw",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
-    Ingredient("Plate"): VoxTrans(
-        "voxel.sprite.crafting_ing.plate",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0,
-    ),
-    Ingredient("Leather"): VoxTrans(
-        "voxel.sprite.crafting_ing.leather",
+    Ingredient("VenomSac"): VoxTrans(
+        "voxel.sprite.crafting_ing.venom_sac",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
-    Ingredient("DragonScale"): VoxTrans(
-        "voxel.sprite.crafting_ing.dragon_scale",
+    Ingredient("PlantFiber"): VoxTrans(
+        "voxel.sprite.crafting_ing.plant_fiber",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
+    Ingredient("Linen"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.linen",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("Wool"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.wool",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("Silk"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.silk",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("Lifecloth"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.lifecloth",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("Moonweave"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.moonweave",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("Sunsilk"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.sunsilk",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
     Ingredient("SilverIngot"): VoxTrans(
-        "voxel.sprite.crafting_ing.silver_ingot",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+        "voxel.sprite.mineral.ingot.silver",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
     ),
     Ingredient("GoldIngot"): VoxTrans(
-        "voxel.sprite.crafting_ing.gold_ingot",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("GoldOre"): VoxTrans(
-        "voxel.sprite.crafting_ing.gold_ore_drop",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("SilverOre"): VoxTrans(
-        "voxel.sprite.crafting_ing.silver_ore_drop",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.8,
+        "voxel.sprite.mineral.ingot.gold",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
     ),
     Ingredient("OrichalcumIngot"): VoxTrans(
-        "voxel.sprite.crafting_ing.orichalcum_ingot",
+        "voxel.sprite.mineral.ingot.orichalcum",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("BloodsteelIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.bloodsteel",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("BronzeIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.bronze",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("CobaltIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.cobalt",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("CopperIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.copper",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("IronIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.iron",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("SteelIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.steel",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("TinIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.tin",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("GoldOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.gold",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("SilverOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.silver",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("OrichalcumIngot"): VoxTrans(
+        "voxel.sprite.mineral.ore.orichalcum",
         (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
     ),
-    Ingredient("Scale"): VoxTrans(
-        "voxel.sprite.crafting_ing.scale",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    Ingredient("BloodsteelOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.bloodsteel",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("CobaltOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.cobalt",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("CopperOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.copper",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("IronOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.iron",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("TinOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.tin",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
     ),
     Ingredient("Honey"): Png(
         "element.items.item_honey",
@@ -2568,27 +2656,27 @@
     ),
     // Gems
     Ingredient("Amethyst"): VoxTrans(
-        "voxel.sprite.gem.amethystgem",
+        "voxel.sprite.mineral.gem.amethystgem",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
     ),
     Ingredient("Topaz"): VoxTrans(
-        "voxel.sprite.gem.topazgem",
+        "voxel.sprite.mineral.gem.topazgem",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
     ),
     Ingredient("Sapphire"): VoxTrans(
-        "voxel.sprite.gem.sapphiregem",
+        "voxel.sprite.mineral.gem.sapphiregem",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.6,
     ),
     Ingredient("Emerald"): VoxTrans(
-        "voxel.sprite.gem.emeraldgem",
+        "voxel.sprite.mineral.gem.emeraldgem",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
     ),
     Ingredient("Ruby"): VoxTrans(
-        "voxel.sprite.gem.rubygem",
+        "voxel.sprite.mineral.gem.rubygem",
         (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
     ),
     Ingredient("Diamond"): VoxTrans(
-        "voxel.sprite.gem.diamondgem",
+        "voxel.sprite.mineral.gem.diamondgem",
         (0.0, 0.0, 0.0), (-55.0, 30.0, 20.0), 0.6,
     ),
     ModularComponent("common.items.crafting_ing.modular.damage.sword.tier5"): VoxTrans(

assets/voxygen/voxel/sprite_manifest.ron

@@ -2774,7 +2774,7 @@ Mud: Some((
 Amethyst: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.amethyst-0",
+            model: "voxygen.voxel.sprite.mineral.gem.amethyst-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2785,7 +2785,7 @@ Amethyst: Some((
 Ruby: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.ruby-0",
+            model: "voxygen.voxel.sprite.mineral.gem.ruby-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2796,7 +2796,7 @@ Ruby: Some((
 Diamond: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.diamond-0",
+            model: "voxygen.voxel.sprite.mineral.gem.diamond-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2807,7 +2807,7 @@ Diamond: Some((
 Sapphire: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.sapphire-0",
+            model: "voxygen.voxel.sprite.mineral.gem.sapphire-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2818,7 +2818,7 @@ Sapphire: Some((
 Emerald: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.emerald-0",
+            model: "voxygen.voxel.sprite.mineral.gem.emerald-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2829,7 +2829,7 @@ Emerald: Some((
 Topaz: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.topaz-0",
+            model: "voxygen.voxel.sprite.mineral.gem.topaz-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2840,7 +2840,7 @@ Topaz: Some((
 AmethystSmall: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.amethyst_S-0",
+            model: "voxygen.voxel.sprite.mineral.gem.amethyst_S-0",
             offset: (-3.5, -3.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2851,7 +2851,7 @@ AmethystSmall: Some((
 TopazSmall: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.topaz_S-0",
+            model: "voxygen.voxel.sprite.mineral.gem.topaz_S-0",
             offset: (-3.5, -3.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2862,7 +2862,7 @@ TopazSmall: Some((
 RubySmall: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.ruby_S-0",
+            model: "voxygen.voxel.sprite.mineral.gem.ruby_S-0",
             offset: (-3.5, -3.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2873,7 +2873,7 @@ RubySmall: Some((
 EmeraldSmall: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.emerald_S-0",
+            model: "voxygen.voxel.sprite.mineral.gem.emerald_S-0",
             offset: (-5.5, -5.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2884,7 +2884,7 @@ EmeraldSmall: Some((
 DiamondSmall: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.diamond_S-0",
+            model: "voxygen.voxel.sprite.mineral.gem.diamond_S-0",
             offset: (-3.5, -3.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),
@@ -2895,7 +2895,7 @@ DiamondSmall: Some((
 SapphireSmall: Some((
     variations: [
         (
-            model: "voxygen.voxel.sprite.gem.sapphire_S-0",
+            model: "voxygen.voxel.sprite.mineral.gem.sapphire_S-0",
             offset: (-3.5, -3.5, 0.0),
             lod_axes: (0.0, 0.0, 0.0),
         ),