From 7a573efab7fe2cd492e5ece6b1f8e14c080a3e21 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Thu, 27 May 2021 03:19:14 -0400
Subject: [PATCH] proper recipes, tanning racks, various fixes

---
 assets/common/cave_scatter/deep.ron           |   2 +-
 .../items/crafting_ing/cloth/cloth_scraps.ron |   2 +-
 .../crafting_ing/cloth/cloth_scraps_red.ron   |   2 +-
 .../items/crafting_ing/cloth/cotton.ron       |   2 +-
 .../items/crafting_ing/cloth/lifecloth.ron    |   2 +-
 .../common/items/crafting_ing/cloth/linen.ron |   2 +-
 .../items/crafting_ing/cloth/moonweave.ron    |   2 +-
 .../common/items/crafting_ing/cloth/silk.ron  |   2 +-
 .../items/crafting_ing/cloth/sunsilk.ron      |   2 +-
 .../common/items/crafting_ing/cloth/wool.ron  |   2 +-
 .../log/{eldwood_logs.ron => eldwood.ron}     |   0
 .../log/{frostwood_logs.ron => frostwood.ron} |   0
 .../log/{hardwood_logs.ron => hardwood.ron}   |   0
 .../log/{ironwood_logs.ron => ironwood.ron}   |   0
 .../log/{wood_logs.ron => wood.ron}           |   0
 assets/common/items/flowers/wild_flax.ron     |   9 +
 assets/common/items/tag_examples/textile.ron  |  14 +
 assets/common/loadouts/village/villager.ron   |   8 -
 .../creature/bird_large/cockatrice.ron        |   2 +-
 .../loot_tables/dungeon/tier-1/enemy.ron      |   1 +
 .../loot_tables/dungeon/tier-5/enemy.ron      |   1 +
 assets/common/recipe_book.ron                 | 423 +++++++++++-------
 assets/voxygen/i18n/en/hud/crafting.ron       |   2 +
 assets/voxygen/item_image_manifest.ron        |  16 +-
 .../voxel/humanoid_armor_back_manifest.ron    |   2 +-
 .../voxel/humanoid_armor_belt_manifest.ron    |   2 +-
 assets/voxygen/voxel/object_manifest.ron      |  30 --
 assets/voxygen/voxel/sprite/flowers/flax.vox  |   3 +
 assets/voxygen/voxel/sprite_manifest.ron      |  45 ++
 common/src/comp/body/object.rs                |   6 -
 common/src/comp/inventory/item/mod.rs         |   4 +
 common/src/terrain/sprite.rs                  |   5 +
 voxygen/src/hud/crafting.rs                   |   8 +
 voxygen/src/hud/img_ids.rs                    |   1 +
 voxygen/src/scene/terrain/watcher.rs          |   3 +
 world/src/layer/scatter.rs                    |   9 +
 .../settlement/building/archetype/house.rs    |   5 +-
 37 files changed, 390 insertions(+), 229 deletions(-)
 rename assets/common/items/crafting_ing/log/{eldwood_logs.ron => eldwood.ron} (100%)
 rename assets/common/items/crafting_ing/log/{frostwood_logs.ron => frostwood.ron} (100%)
 rename assets/common/items/crafting_ing/log/{hardwood_logs.ron => hardwood.ron} (100%)
 rename assets/common/items/crafting_ing/log/{ironwood_logs.ron => ironwood.ron} (100%)
 rename assets/common/items/crafting_ing/log/{wood_logs.ron => wood.ron} (100%)
 create mode 100644 assets/common/items/flowers/wild_flax.ron
 create mode 100644 assets/common/items/tag_examples/textile.ron
 create mode 100644 assets/voxygen/voxel/sprite/flowers/flax.vox

diff --git a/assets/common/cave_scatter/deep.ron b/assets/common/cave_scatter/deep.ron
index 98ff622ab4..d362f957b5 100644
--- a/assets/common/cave_scatter/deep.ron
+++ b/assets/common/cave_scatter/deep.ron
@@ -14,7 +14,7 @@
     (60, Iron),
     (10, Silver),
     (6, Gold),
-    (8, RubySmall),
+    (10, RubySmall),
     (8, DiamondSmall),
     (5, Chest),
     (15, Crate),
diff --git a/assets/common/items/crafting_ing/cloth/cloth_scraps.ron b/assets/common/items/crafting_ing/cloth/cloth_scraps.ron
index 06e32164c6..208b182c14 100644
--- a/assets/common/items/crafting_ing/cloth/cloth_scraps.ron
+++ b/assets/common/items/crafting_ing/cloth/cloth_scraps.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "ClothScraps",
     ),
     quality: Common,
-    tags: [BaseMaterial],
+    tags: [Textile],
 )
diff --git a/assets/common/items/crafting_ing/cloth/cloth_scraps_red.ron b/assets/common/items/crafting_ing/cloth/cloth_scraps_red.ron
index dbb1373f50..a0612f89b7 100644
--- a/assets/common/items/crafting_ing/cloth/cloth_scraps_red.ron
+++ b/assets/common/items/crafting_ing/cloth/cloth_scraps_red.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "ClothScrapsRed",
     ),
     quality: Common,
-    tags: [BaseMaterial],
+    tags: [Textile],
 )
diff --git a/assets/common/items/crafting_ing/cloth/cotton.ron b/assets/common/items/crafting_ing/cloth/cotton.ron
index 48b5b78d9d..243e4e2f38 100644
--- a/assets/common/items/crafting_ing/cloth/cotton.ron
+++ b/assets/common/items/crafting_ing/cloth/cotton.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "Cotton",
     ),
     quality: Low,
-    tags: [],
+    tags: [Textile],
 )
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/cloth/lifecloth.ron b/assets/common/items/crafting_ing/cloth/lifecloth.ron
index f697021012..f19cdd8e9c 100644
--- a/assets/common/items/crafting_ing/cloth/lifecloth.ron
+++ b/assets/common/items/crafting_ing/cloth/lifecloth.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "Lifecloth",
     ),
     quality: High,
-    tags: [],
+    tags: [Textile],
 )
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/cloth/linen.ron b/assets/common/items/crafting_ing/cloth/linen.ron
index 60373574c7..6b7ad7ff50 100644
--- a/assets/common/items/crafting_ing/cloth/linen.ron
+++ b/assets/common/items/crafting_ing/cloth/linen.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "Linen",
     ),
     quality: Low,
-    tags: [],
+    tags: [Textile],
 )
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/cloth/moonweave.ron b/assets/common/items/crafting_ing/cloth/moonweave.ron
index 8e0d07334a..0a822f1328 100644
--- a/assets/common/items/crafting_ing/cloth/moonweave.ron
+++ b/assets/common/items/crafting_ing/cloth/moonweave.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "Moonweave",
     ),
     quality: Epic,
-    tags: [],
+    tags: [Textile],
 )
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/cloth/silk.ron b/assets/common/items/crafting_ing/cloth/silk.ron
index 23b716f958..c4e1a0598a 100644
--- a/assets/common/items/crafting_ing/cloth/silk.ron
+++ b/assets/common/items/crafting_ing/cloth/silk.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "Silk",
     ),
     quality: Moderate,
-    tags: [],
+    tags: [Textile],
 )
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/cloth/sunsilk.ron b/assets/common/items/crafting_ing/cloth/sunsilk.ron
index 9422b96370..3d063eb955 100644
--- a/assets/common/items/crafting_ing/cloth/sunsilk.ron
+++ b/assets/common/items/crafting_ing/cloth/sunsilk.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "Sunsilk",
     ),
     quality: Legendary,
-    tags: [],
+    tags: [Textile],
 )
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/cloth/wool.ron b/assets/common/items/crafting_ing/cloth/wool.ron
index 38c055d8b4..e1cf55c706 100644
--- a/assets/common/items/crafting_ing/cloth/wool.ron
+++ b/assets/common/items/crafting_ing/cloth/wool.ron
@@ -5,5 +5,5 @@ ItemDef(
         kind: "Wool",
     ),
     quality: Common,
-    tags: [],
+    tags: [Textile],
 )
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/log/eldwood_logs.ron b/assets/common/items/crafting_ing/log/eldwood.ron
similarity index 100%
rename from assets/common/items/crafting_ing/log/eldwood_logs.ron
rename to assets/common/items/crafting_ing/log/eldwood.ron
diff --git a/assets/common/items/crafting_ing/log/frostwood_logs.ron b/assets/common/items/crafting_ing/log/frostwood.ron
similarity index 100%
rename from assets/common/items/crafting_ing/log/frostwood_logs.ron
rename to assets/common/items/crafting_ing/log/frostwood.ron
diff --git a/assets/common/items/crafting_ing/log/hardwood_logs.ron b/assets/common/items/crafting_ing/log/hardwood.ron
similarity index 100%
rename from assets/common/items/crafting_ing/log/hardwood_logs.ron
rename to assets/common/items/crafting_ing/log/hardwood.ron
diff --git a/assets/common/items/crafting_ing/log/ironwood_logs.ron b/assets/common/items/crafting_ing/log/ironwood.ron
similarity index 100%
rename from assets/common/items/crafting_ing/log/ironwood_logs.ron
rename to assets/common/items/crafting_ing/log/ironwood.ron
diff --git a/assets/common/items/crafting_ing/log/wood_logs.ron b/assets/common/items/crafting_ing/log/wood.ron
similarity index 100%
rename from assets/common/items/crafting_ing/log/wood_logs.ron
rename to assets/common/items/crafting_ing/log/wood.ron
diff --git a/assets/common/items/flowers/wild_flax.ron b/assets/common/items/flowers/wild_flax.ron
new file mode 100644
index 0000000000..42994ffcd0
--- /dev/null
+++ b/assets/common/items/flowers/wild_flax.ron
@@ -0,0 +1,9 @@
+ItemDef(
+    name: "Wild Flax",
+    description: "Could be used to spin some simple cloth.",
+    kind: Ingredient(
+        kind: "WildFlax",
+    ),
+    quality: Common,
+    tags: [],
+)
diff --git a/assets/common/items/tag_examples/textile.ron b/assets/common/items/tag_examples/textile.ron
new file mode 100644
index 0000000000..ddc1d5c00f
--- /dev/null
+++ b/assets/common/items/tag_examples/textile.ron
@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Any woven cloth",
+    description: "Cloths spun from plant material.",
+    kind: TagExamples(
+        item_ids: [
+            "common.items.crafting_ing.cloth.moonweave",
+            "common.items.crafting_ing.cloth.sunsilk",
+        ],
+    ),
+    quality: Common,
+    tags: [],
+)
+
+
diff --git a/assets/common/loadouts/village/villager.ron b/assets/common/loadouts/village/villager.ron
index 4be54001f5..72e88f6be4 100644
--- a/assets/common/loadouts/village/villager.ron
+++ b/assets/common/loadouts/village/villager.ron
@@ -11,12 +11,4 @@
         (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_0"))),
         (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_1"))),
     ]),
-
-    Armor(Belt): Item("common.items.armor.swift.belt"),
-    Armor(Legs): Item("common.items.armor.misc.pants.worker_blue"),
-
-    Armor(Feet): Choice([
-        (1.0, Some(Item("common.items.armor.swift.foot"))),
-        (1.0, Some(Item("common.items.armor.misc.foot.sandals"))),
-    ]),
 })
diff --git a/assets/common/loot_tables/creature/bird_large/cockatrice.ron b/assets/common/loot_tables/creature/bird_large/cockatrice.ron
index 12debee315..dff08ded99 100644
--- a/assets/common/loot_tables/creature/bird_large/cockatrice.ron
+++ b/assets/common/loot_tables/creature/bird_large/cockatrice.ron
@@ -1,4 +1,4 @@
 [
-    (1.0, Item("common.items.food.meat.bird_raw")),
+    (0.1, Item("common.items.food.meat.bird_large_raw")),
     (1.0, Item("common.items.crafting_ing.hide.scales")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/enemy.ron b/assets/common/loot_tables/dungeon/tier-1/enemy.ron
index d3129fed5e..1450cef0e2 100644
--- a/assets/common/loot_tables/dungeon/tier-1/enemy.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/enemy.ron
@@ -2,4 +2,5 @@
     (1.0, LootTable("common.loot_tables.humanoids")),
     (1.0, LootTable("common.loot_tables.armor.leather")),
     (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.5, Item("common.items.crafting_ing.sticky_thread")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-5/enemy.ron b/assets/common/loot_tables/dungeon/tier-5/enemy.ron
index 37620ba3af..168307b1a5 100644
--- a/assets/common/loot_tables/dungeon/tier-5/enemy.ron
+++ b/assets/common/loot_tables/dungeon/tier-5/enemy.ron
@@ -14,4 +14,5 @@
     (0.001, Item("common.items.armor.misc.back.backpack")),
     (0.1, Item("common.items.armor.misc.bag.heavy_seabag")),
     (1.0, LootTable("common.loot_tables.consumable.default")),
+    (4.0, Item("common.items.crafting_ing.hide.dragon_scale")),
 ]
diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron
index eb1fe812a2..dfc7352bf1 100644
--- a/assets/common/recipe_book.ron
+++ b/assets/common/recipe_book.ron
@@ -19,8 +19,8 @@
     "sewing_set": (
         output: ("common.items.crafting_tools.sewing_set", 1),
         inputs: [
-            (Item("common.items.crafting_ing.twigs"), 4),
-            (Item("common.items.crafting_ing.stones"), 2),
+            (Item("common.items.crafting_ing.cloth.linen"), 1),
+            (Item("common.items.mineral.ore.tin"), 1),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -189,14 +189,14 @@
         inputs: [
             (Item("common.items.crafting_ing.hide.animal_hide"), 1),
         ],
-        craft_sprite: Some(CraftingBench),
+        craft_sprite: Some(TanningRack),
     ),
     "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),
+        craft_sprite: Some(TanningRack),
     ),
     "gold ingot": (
         output: ("common.items.mineral.ingot.gold", 1),
@@ -284,7 +284,7 @@
     "linen": (
         output: ("common.items.crafting_ing.cloth.linen", 1),
         inputs: [
-            (Item("common.items.flowers.plant_fiber"), 1),
+            (Item("common.items.flowers.wild_flax"), 1),
         ],		
         craft_sprite: Some(SpinningWheel),
     ),
@@ -298,7 +298,8 @@
     "lifecloth": (
         output: ("common.items.crafting_ing.cloth.lifecloth", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.animal_misc.lively_vine"), 1),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
         ],		
         craft_sprite: Some(SpinningWheel),
     ),
@@ -468,7 +469,7 @@
     "rawhide back": (
         output: ("common.items.armor.hide.rawhide.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 4),
+            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -492,7 +493,7 @@
     "rawhide feet": (
         output: ("common.items.armor.hide.rawhide.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 4),
+            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -500,7 +501,7 @@
     "rawhide hands": (
         output: ("common.items.armor.hide.rawhide.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 4),
+            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -516,7 +517,7 @@
     "rawhide shoulder": (
         output: ("common.items.armor.hide.rawhide.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 10),
+            (Item("common.items.crafting_ing.leather.simple_leather"), 8),
             (Item("common.items.crafting_ing.leather.leather_strips"), 6),
         ],
         craft_sprite: Some(CraftingBench),
@@ -525,7 +526,7 @@
     "leather back": (
         output: ("common.items.armor.hide.leather.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -549,7 +550,7 @@
     "leather feet": (
         output: ("common.items.armor.hide.leather.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -557,7 +558,7 @@
     "leather hands": (
         output: ("common.items.armor.hide.leather.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -573,7 +574,7 @@
     "leather shoulder": (
         output: ("common.items.armor.hide.leather.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 10),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 8),
             (Item("common.items.crafting_ing.leather.leather_strips"), 6),
         ],
         craft_sprite: Some(CraftingBench),
@@ -582,7 +583,7 @@
     "scale back": (
         output: ("common.items.armor.hide.scale.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 4),
+            (Item("common.items.crafting_ing.hide.scales"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -606,7 +607,7 @@
     "scale feet": (
         output: ("common.items.armor.hide.scale.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 4),
+            (Item("common.items.crafting_ing.hide.scales"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -614,7 +615,7 @@
     "scale hands": (
         output: ("common.items.armor.hide.scale.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 4),
+            (Item("common.items.crafting_ing.hide.scales"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -630,7 +631,7 @@
     "scale shoulder": (
         output: ("common.items.armor.hide.scale.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 10),
+            (Item("common.items.crafting_ing.hide.scales"), 8),
             (Item("common.items.crafting_ing.leather.leather_strips"), 6),
         ],
         craft_sprite: Some(CraftingBench),
@@ -639,7 +640,8 @@
     "carapace back": (
         output: ("common.items.armor.hide.carapace.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -647,6 +649,7 @@
     "carapace belt": (
         output: ("common.items.armor.hide.carapace.belt", 1),
         inputs: [
+            (Item("common.items.mineral.ingot.steel"), 1),
             (Item("common.items.crafting_ing.hide.carapace"), 2),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
@@ -655,6 +658,7 @@
     "carapace chest": (
         output: ("common.items.armor.hide.carapace.chest", 1),
         inputs: [
+            (Item("common.items.mineral.ingot.steel"), 2),
             (Item("common.items.crafting_ing.hide.carapace"), 10),
             (Item("common.items.crafting_ing.leather.leather_strips"), 4),
         ],
@@ -663,7 +667,8 @@
     "carapace feet": (
         output: ("common.items.armor.hide.carapace.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -671,7 +676,8 @@
     "carapace hands": (
         output: ("common.items.armor.hide.carapace.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -679,6 +685,7 @@
     "carapace pants": (
         output: ("common.items.armor.hide.carapace.pants", 1),
         inputs: [
+            (Item("common.items.mineral.ingot.steel"), 1),
             (Item("common.items.crafting_ing.hide.carapace"), 8),
             (Item("common.items.crafting_ing.leather.leather_strips"), 4),
         ],
@@ -687,7 +694,8 @@
     "carapace shoulder": (
         output: ("common.items.armor.hide.carapace.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 10),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.hide.carapace"), 8),
             (Item("common.items.crafting_ing.leather.leather_strips"), 6),
         ],
         craft_sprite: Some(CraftingBench),
@@ -696,56 +704,67 @@
     "primal back": (
         output: ("common.items.armor.hide.primal.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "primal belt": (
         output: ("common.items.armor.hide.primal.belt", 1),
         inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
             (Item("common.items.crafting_ing.hide.plate"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "primal chest": (
         output: ("common.items.armor.hide.primal.chest", 1),
         inputs: [
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
             (Item("common.items.crafting_ing.hide.plate"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "primal feet": (
         output: ("common.items.armor.hide.primal.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "primal hands": (
         output: ("common.items.armor.hide.primal.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "primal pants": (
         output: ("common.items.armor.hide.primal.pants", 1),
         inputs: [
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
             (Item("common.items.crafting_ing.hide.plate"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "primal shoulder": (
         output: ("common.items.armor.hide.primal.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
+            (Item("common.items.crafting_ing.hide.plate"), 8),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 6),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -753,56 +772,63 @@
     "dragonscale back": (
         output: ("common.items.armor.hide.dragonscale.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "dragonscale belt": (
         output: ("common.items.armor.hide.dragonscale.belt", 1),
         inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
             (Item("common.items.crafting_ing.hide.dragon_scale"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "dragonscale chest": (
         output: ("common.items.armor.hide.dragonscale.chest", 1),
         inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
             (Item("common.items.crafting_ing.hide.dragon_scale"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.hide.scales"), 4),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "dragonscale feet": (
         output: ("common.items.armor.hide.dragonscale.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "dragonscale hands": (
         output: ("common.items.armor.hide.dragonscale.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "dragonscale pants": (
         output: ("common.items.armor.hide.dragonscale.pants", 1),
         inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
             (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.hide.scales"), 4),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "dragonscale shoulder": (
         output: ("common.items.armor.hide.dragonscale.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
+            (Item("common.items.crafting_ing.hide.scales"), 6),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -810,8 +836,8 @@
     "linen back": (
         output: ("common.items.armor.cloth.linen.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.linen"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -819,7 +845,7 @@
         output: ("common.items.armor.cloth.linen.belt", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.linen"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -827,23 +853,23 @@
         output: ("common.items.armor.cloth.linen.chest", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.linen"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "linen feet": (
         output: ("common.items.armor.cloth.linen.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.linen"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "linen hands": (
         output: ("common.items.armor.cloth.linen.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.linen"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -851,15 +877,15 @@
         output: ("common.items.armor.cloth.linen.pants", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.linen"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "linen shoulder": (
         output: ("common.items.armor.cloth.linen.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.crafting_ing.cloth.linen"), 8),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -867,8 +893,10 @@
     "woolen back": (
         output: ("common.items.armor.cloth.woolen.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.wool"), 3),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -876,7 +904,9 @@
         output: ("common.items.armor.cloth.woolen.belt", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.wool"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -884,23 +914,29 @@
         output: ("common.items.armor.cloth.woolen.chest", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.wool"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "woolen feet": (
         output: ("common.items.armor.cloth.woolen.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.wool"), 3),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "woolen hands": (
         output: ("common.items.armor.cloth.woolen.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.wool"), 3),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -908,15 +944,19 @@
         output: ("common.items.armor.cloth.woolen.pants", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.wool"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "woolen shoulder": (
         output: ("common.items.armor.cloth.woolen.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.crafting_ing.cloth.wool"), 8),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -924,8 +964,8 @@
     "silken back": (
         output: ("common.items.armor.cloth.silken.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -933,7 +973,7 @@
         output: ("common.items.armor.cloth.silken.belt", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.silk"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -941,23 +981,24 @@
         output: ("common.items.armor.cloth.silken.chest", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.silk"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.mineral.gem.amethyst"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "silken feet": (
         output: ("common.items.armor.cloth.silken.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "silken hands": (
         output: ("common.items.armor.cloth.silken.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -965,15 +1006,17 @@
         output: ("common.items.armor.cloth.silken.pants", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.silk"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.mineral.gem.amethyst"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "silken shoulder": (
         output: ("common.items.armor.cloth.silken.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.crafting_ing.cloth.silk"), 8),
+            (Item("common.items.mineral.gem.amethyst"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -981,8 +1024,9 @@
     "druid back": (
         output: ("common.items.armor.cloth.druid.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -990,7 +1034,8 @@
         output: ("common.items.armor.cloth.druid.belt", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -998,23 +1043,26 @@
         output: ("common.items.armor.cloth.druid.chest", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.lifecloth"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.mineral.ore.veloritefrag"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "druid feet": (
         output: ("common.items.armor.cloth.druid.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "druid hands": (
         output: ("common.items.armor.cloth.druid.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1022,15 +1070,17 @@
         output: ("common.items.armor.cloth.druid.pants", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.lifecloth"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "druid shoulder": (
         output: ("common.items.armor.cloth.druid.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 8),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1038,8 +1088,10 @@
     "moonweave back": (
         output: ("common.items.armor.cloth.moonweave.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1047,7 +1099,9 @@
         output: ("common.items.armor.cloth.moonweave.belt", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.moonweave"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1055,23 +1109,29 @@
         output: ("common.items.armor.cloth.moonweave.chest", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.moonweave"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 5),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "moonweave feet": (
         output: ("common.items.armor.cloth.moonweave.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "moonweave hands": (
         output: ("common.items.armor.cloth.moonweave.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1079,15 +1139,19 @@
         output: ("common.items.armor.cloth.moonweave.pants", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.moonweave"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "moonweave shoulder": (
         output: ("common.items.armor.cloth.moonweave.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.crafting_ing.cloth.moonweave"), 8),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1095,8 +1159,9 @@
     "sunsilk back": (
         output: ("common.items.armor.cloth.sunsilk.back", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1104,7 +1169,8 @@
         output: ("common.items.armor.cloth.sunsilk.belt", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.sunsilk"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1112,23 +1178,26 @@
         output: ("common.items.armor.cloth.sunsilk.chest", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.sunsilk"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 4),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "sunsilk feet": (
         output: ("common.items.armor.cloth.sunsilk.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "sunsilk hands": (
         output: ("common.items.armor.cloth.sunsilk.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1136,15 +1205,17 @@
         output: ("common.items.armor.cloth.sunsilk.pants", 1),
         inputs: [
             (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
     "sunsilk shoulder": (
         output: ("common.items.armor.cloth.sunsilk.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
         craft_sprite: Some(Loom),
     ),
@@ -1152,7 +1223,7 @@
     "bronze back": (
         output: ("common.items.armor.mail.bronze.back", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 4),
+            (Item("common.items.mineral.ingot.bronze"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1176,7 +1247,7 @@
     "bronze feet": (
         output: ("common.items.armor.mail.bronze.foot", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 4),
+            (Item("common.items.mineral.ingot.bronze"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1184,7 +1255,7 @@
     "bronze hands": (
         output: ("common.items.armor.mail.bronze.hand", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 4),
+            (Item("common.items.mineral.ingot.bronze"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1200,7 +1271,7 @@
     "bronze shoulder": (
         output: ("common.items.armor.mail.bronze.shoulder", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 10),
+            (Item("common.items.mineral.ingot.bronze"), 8),
             (Item("common.items.crafting_ing.leather.leather_strips"), 6),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1209,7 +1280,7 @@
     "iron back": (
         output: ("common.items.armor.mail.iron.back", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.iron"), 4),
+            (Item("common.items.mineral.ingot.iron"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1233,7 +1304,7 @@
     "iron feet": (
         output: ("common.items.armor.mail.iron.foot", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.iron"), 4),
+            (Item("common.items.mineral.ingot.iron"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1241,7 +1312,7 @@
     "iron hands": (
         output: ("common.items.armor.mail.iron.hand", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.iron"), 4),
+            (Item("common.items.mineral.ingot.iron"), 3),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1257,7 +1328,7 @@
     "iron shoulder": (
         output: ("common.items.armor.mail.iron.shoulder", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.iron"), 10),
+            (Item("common.items.mineral.ingot.iron"), 8),
             (Item("common.items.crafting_ing.leather.leather_strips"), 6),
         ],
         craft_sprite: Some(CraftingBench),
@@ -1266,8 +1337,8 @@
     "steel back": (
         output: ("common.items.armor.mail.steel.back", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.steel"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.steel"), 3),
+            (Item("common.items.crafting_ing.cloth.linen"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1275,7 +1346,7 @@
         output: ("common.items.armor.mail.steel.belt", 1),
         inputs: [
             (Item("common.items.mineral.ingot.steel"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1283,23 +1354,23 @@
         output: ("common.items.armor.mail.steel.chest", 1),
         inputs: [
             (Item("common.items.mineral.ingot.steel"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "steel feet": (
         output: ("common.items.armor.mail.steel.foot", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.steel"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.steel"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "steel hands": (
         output: ("common.items.armor.mail.steel.hand", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.steel"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.steel"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1307,15 +1378,15 @@
         output: ("common.items.armor.mail.steel.pants", 1),
         inputs: [
             (Item("common.items.mineral.ingot.steel"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "steel shoulder": (
         output: ("common.items.armor.mail.steel.shoulder", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.steel"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.mineral.ingot.steel"), 8),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 6),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1323,8 +1394,9 @@
     "cobalt back": (
         output: ("common.items.armor.mail.cobalt.back", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_ing.cloth.silk"), 4),
+            (Item("common.items.mineral.gem.sapphire"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1332,7 +1404,8 @@
         output: ("common.items.armor.mail.cobalt.belt", 1),
         inputs: [
             (Item("common.items.mineral.ingot.cobalt"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.cloth.silk"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 1),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1340,23 +1413,24 @@
         output: ("common.items.armor.mail.cobalt.chest", 1),
         inputs: [
             (Item("common.items.mineral.ingot.cobalt"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "cobalt feet": (
         output: ("common.items.armor.mail.cobalt.foot", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "cobalt hands": (
         output: ("common.items.armor.mail.cobalt.hand", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1364,15 +1438,17 @@
         output: ("common.items.armor.mail.cobalt.pants", 1),
         inputs: [
             (Item("common.items.mineral.ingot.cobalt"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "cobalt shoulder": (
         output: ("common.items.armor.mail.cobalt.shoulder", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.mineral.ingot.cobalt"), 8),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1380,8 +1456,10 @@
     "bloodsteel back": (
         output: ("common.items.armor.mail.bloodsteel.back", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.hide.carapace"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.gem.ruby"), 1),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1389,7 +1467,7 @@
         output: ("common.items.armor.mail.bloodsteel.belt", 1),
         inputs: [
             (Item("common.items.mineral.ingot.bloodsteel"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1397,23 +1475,25 @@
         output: ("common.items.armor.mail.bloodsteel.chest", 1),
         inputs: [
             (Item("common.items.mineral.ingot.bloodsteel"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.mineral.gem.ruby"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "bloodsteel feet": (
         output: ("common.items.armor.mail.bloodsteel.foot", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "bloodsteel hands": (
         output: ("common.items.armor.mail.bloodsteel.hand", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1421,15 +1501,17 @@
         output: ("common.items.armor.mail.bloodsteel.pants", 1),
         inputs: [
             (Item("common.items.mineral.ingot.bloodsteel"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
+            (Item("common.items.mineral.gem.ruby"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "bloodsteel shoulder": (
         output: ("common.items.armor.mail.bloodsteel.shoulder", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.mineral.ingot.bloodsteel"), 8),
+            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.mineral.gem.ruby"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1437,8 +1519,10 @@
     "orichalcum back": (
         output: ("common.items.armor.mail.orichalcum.back", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.orichalcum"), 3),
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 1),        
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1446,7 +1530,9 @@
         output: ("common.items.armor.mail.orichalcum.belt", 1),
         inputs: [
             (Item("common.items.mineral.ingot.orichalcum"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 1),        
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1454,23 +1540,30 @@
         output: ("common.items.armor.mail.orichalcum.chest", 1),
         inputs: [
             (Item("common.items.mineral.ingot.orichalcum"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_ing.hide.plate"), 4),
+            (Item("common.items.mineral.gem.diamond"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "orichalcum feet": (
         output: ("common.items.armor.mail.orichalcum.foot", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.orichalcum"), 3),
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.mineral.gem.diamond"), 1),
+            (Item("common.items.mineral.gem.sapphire"), 1),        
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "orichalcum hands": (
         output: ("common.items.armor.mail.orichalcum.hand", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 4),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+            (Item("common.items.mineral.ingot.orichalcum"), 3),
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.mineral.gem.diamond"), 1),
+            (Item("common.items.mineral.gem.sapphire"), 1),            
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1478,15 +1571,18 @@
         output: ("common.items.armor.mail.orichalcum.pants", 1),
         inputs: [
             (Item("common.items.mineral.ingot.orichalcum"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.mineral.ingot.cobalt"), 1),
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.mineral.gem.diamond"), 2),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "orichalcum shoulder": (
         output: ("common.items.armor.mail.orichalcum.shoulder", 1),
         inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+            (Item("common.items.mineral.ingot.orichalcum"), 8),
+            (Item("common.items.crafting_ing.hide.plate"), 4),
+            (Item("common.items.mineral.gem.sapphire"), 2),            
         ],
         craft_sprite: Some(CraftingBench),
     ),
@@ -1598,10 +1694,9 @@
         ],
     ),
     "leather_strips": (
-        output: ("common.items.crafting_ing.leather.leather_strips", 1),
+        output: ("common.items.crafting_ing.leather.leather_strips", 3),
         inputs: [
             (Tag(LeatherItem), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
     ),
     //"metal_blade": (
diff --git a/assets/voxygen/i18n/en/hud/crafting.ron b/assets/voxygen/i18n/en/hud/crafting.ron
index 53f020d10c..0e9a767784 100644
--- a/assets/voxygen/i18n/en/hud/crafting.ron
+++ b/assets/voxygen/i18n/en/hud/crafting.ron
@@ -17,6 +17,7 @@
         "hud.crafting.forge": "Forge",
         "hud.crafting.loom": "Loom",
         "hud.crafting.spinning_wheel": "Spinning Wheel",
+        "hud.crafting.tanning_rack": "Tanning Rack",
         // Tabs
         "hud.crafting.tabs.all": "All",
         "hud.crafting.tabs.armor": "Armor",
@@ -28,6 +29,7 @@
         "hud.crafting.tabs.utility": "Utility",
         "hud.crafting.tabs.weapon": "Weapons",
         "hud.crafting.tabs.bag": "Bags",
+        "hud.crafting.tabs.material": "Materials",
     },
 
 
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index dcc4629fa9..b6f7dcec5d 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -21,14 +21,18 @@
     ),    
     Tool("Forge"): VoxTrans(
         "voxel.object.forge",
-       (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
+       (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0,
     ),  
     Tool("Loom"): VoxTrans(
         "voxel.object.loom",
-       (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
+       (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0,
     ),  
     Tool("SpinningWheel"): VoxTrans(
         "voxel.object.spinning_wheel",
+       (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0,
+    ),  
+    Tool("TanningRack"): VoxTrans(
+        "voxel.object.tanning_rack",
        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
     ),  
     // Weapons
@@ -2533,6 +2537,10 @@
         "voxel.sprite.flowers.pyrebloom",
         (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.9,
     ),
+    Ingredient("WildFlax"): VoxTrans(
+        "voxel.sprite.flowers.flax",
+        (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.8,
+    ),
     Ingredient("CottonBoll"): VoxTrans(
         "voxel.sprite.crafting_ing.cotton_boll",
         (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
@@ -2613,10 +2621,6 @@
         "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("BloodstoneOre"): VoxTrans(
         "voxel.sprite.mineral.ore.bloodstone",
         (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
index 7a641648a6..27f8a09191 100644
--- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
@@ -53,7 +53,7 @@
             color: None
         ),
         "Leather": (
-            vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)),
+            vox_spec: ("armor.hide.leather.back", (-4.0, -1.0, -6.0)),
             color: None
         ),
         "Scale": (
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index 2da9ad5b3d..f5f317aaa2 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -85,7 +85,7 @@
             color: None
         ),
         "Leather": (
-            vox_spec: ("armor.hide.leather.belt", (-5.0, -3.5, 2.0)),
+            vox_spec: ("armor.hide.leather.belt", (-4.0, -3.5, 2.0)),
             color: None
         ),
         "Scale":(
diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron
index 95044837d2..5940c0e8bd 100644
--- a/assets/voxygen/voxel/object_manifest.ron
+++ b/assets/voxygen/voxel/object_manifest.ron
@@ -99,36 +99,6 @@
             central: ("armor.empty"),
         )
     ),
-    Forge: (
-        bone0: (
-            offset: (-6.5, -6.0, 0.0),
-            central: ("object.forge"),
-        ),
-        bone1: (
-            offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),
-        )
-    ),
-    Loom: (
-        bone0: (
-            offset: (-6.0, -4.0, 0.0),
-            central: ("object.loom"),
-        ),
-        bone1: (
-            offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),
-        )
-    ),
-    SpinningWheel: (
-        bone0: (
-            offset: (-7.5, -5.0, 0.0),
-            central: ("object.spinning_wheel"),
-        ),
-        bone1: (
-            offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),
-        )
-    ),
     ChestVines: (
         bone0: (
             offset: (-7.5, -6.0, 0.0),
diff --git a/assets/voxygen/voxel/sprite/flowers/flax.vox b/assets/voxygen/voxel/sprite/flowers/flax.vox
new file mode 100644
index 0000000000..8b80f1044d
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/flowers/flax.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c437f66903aafe0a54697ca38ba0081211156440e6f6d76d86a353041c7d6089
+size 1280
diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron
index 0bdb988ea6..5c9ce30a43 100644
--- a/assets/voxygen/voxel/sprite_manifest.ron
+++ b/assets/voxygen/voxel/sprite_manifest.ron
@@ -3022,6 +3022,41 @@ Pyrebloom: Some((
     ],
     wind_sway: 0.0,
 )),
+WildFlax: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.flax.flax-0",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.7),
+        ),
+        (
+            model: "voxygen.voxel.sprite.flax.flax-1",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.7),
+        ),
+        (
+            model: "voxygen.voxel.sprite.flax.flax-2",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.7),
+        ),
+        (
+            model: "voxygen.voxel.sprite.flax.flax-3",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.7),
+        ),
+        (
+            model: "voxygen.voxel.sprite.flax.flax-4",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.7),
+        ),
+        (
+            model: "voxygen.voxel.sprite.flax.flax-5",
+            offset: (-6.0, -6.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.7),
+        ),
+    ],
+    wind_sway: 0.4,
+)),
 // Lantern
 Lantern: Some((
     variations: [
@@ -3086,6 +3121,16 @@ SpinningWheel: Some((
     ],
     wind_sway: 0.0,
 )),
+TanningRack: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.object.tanning_rack",
+            offset: (-7.5, -4.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
 // Crafting Bench
 CraftingBench: Some((
     variations: [
diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs
index 3c52cbc462..95d8978b9d 100644
--- a/common/src/comp/body/object.rs
+++ b/common/src/comp/body/object.rs
@@ -234,9 +234,6 @@ impl Body {
             Body::CarpetHumanSquircle => "carpet_human_squircle",
             Body::Pouch => "pouch",
             Body::CraftingBench => "crafting_bench",
-            Body::Forge => "forge",
-            Body::Loom => "loom",
-            Body::SpinningWheel => "spinning_wheel",
             Body::BoltFire => "bolt_fire",
             Body::BoltFireBig => "bolt_fire_big",
             Body::ArrowSnake => "arrow_snake",
@@ -323,9 +320,6 @@ impl Body {
             | Body::ChestVines => 100.0,
             Body::Coins => 1.0,
             Body::CraftingBench => 100.0,
-            Body::Forge => 100.0,
-            Body::Loom => 100.0,
-            Body::SpinningWheel => 100.0,
             Body::Crate => 50.0,
             Body::Crossbow => 200.0,
             Body::DoorSpooky => 20.0,
diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index 183f599384..978092369a 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -97,6 +97,7 @@ pub enum ItemTag {
     LeatherItem,
     ModularComponent(ModularComponentTag),
     MetalIngot,
+    Textile,
     Cultist,
     Potion,
     Food,
@@ -113,6 +114,7 @@ impl TagExampleInfo for ItemTag {
             ItemTag::LeatherItem => "leather item",
             ItemTag::ModularComponent(kind) => kind.name(),
             ItemTag::MetalIngot => "metal ingot",
+            ItemTag::Textile => "textile",
             ItemTag::Cultist => "cultist",
             ItemTag::Potion => "potion",
             ItemTag::Food => "food",
@@ -130,6 +132,7 @@ impl TagExampleInfo for ItemTag {
             ItemTag::LeatherItem => "common.items.tag_examples.leather_item",
             ItemTag::ModularComponent(tag) => tag.exemplar_identifier(),
             ItemTag::MetalIngot => "common.items.tag_examples.metal_ingot",
+            ItemTag::Textile => "common.items.tag_examples.textile",
             ItemTag::Cultist => "common.items.tag_examples.cultist",
             ItemTag::Potion => "common.items.tag_examples.placeholder",
             ItemTag::Food => "common.items.tag_examples.placeholder",
@@ -749,6 +752,7 @@ impl Item {
             SpriteKind::Cotton => "common.items.crafting_ing.cotton_boll",
             SpriteKind::Moonbell => "common.items.flowers.moonbell",
             SpriteKind::Pyrebloom => "common.items.flowers.pyrebloom",
+            SpriteKind::WildFlax => "common.items.flowers.wild_flax",
             SpriteKind::Seashells => "common.items.crafting_ing.seashells",
             // Containers
             // IMPORTANT: Add any new container to `SpriteKind::is_container`
diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs
index 6a4666a8f7..962334283c 100644
--- a/common/src/terrain/sprite.rs
+++ b/common/src/terrain/sprite.rs
@@ -168,6 +168,8 @@ make_case_elim!(
         Cotton = 0x8D,
         Moonbell = 0x8E,
         Pyrebloom = 0x8F,
+        TanningRack = 0x90,
+        WildFlax = 0x91,
     }
 );
 
@@ -219,6 +221,7 @@ impl SpriteKind {
             SpriteKind::Forge => 2.7,
             SpriteKind::Cauldron => 1.27,
             SpriteKind::SpinningWheel => 1.6,
+            SpriteKind::TanningRack => 2.2,
             SpriteKind::Loom => 1.27,
             SpriteKind::Anvil => 1.1,
             SpriteKind::CookingPot => 1.36,
@@ -292,6 +295,7 @@ impl SpriteKind {
             SpriteKind::Cotton => true,
             SpriteKind::Moonbell => true,
             SpriteKind::Pyrebloom => true,
+            SpriteKind::WildFlax => true,
             _ => false,
         }
     }
@@ -394,6 +398,7 @@ impl SpriteKind {
                 | SpriteKind::Anvil
                 | SpriteKind::CookingPot
                 | SpriteKind::SpinningWheel
+                | SpriteKind::TanningRack
                 | SpriteKind::Loom
         )
     }
diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs
index 44947a5cde..2ede2884c8 100644
--- a/voxygen/src/hud/crafting.rs
+++ b/voxygen/src/hud/crafting.rs
@@ -147,6 +147,7 @@ pub enum CraftingTab {
     Tool,
     Utility,
     Glider,
+    Material,
 }
 impl CraftingTab {
     fn name_key(&self) -> &str {
@@ -161,6 +162,7 @@ impl CraftingTab {
             CraftingTab::Utility => "hud.crafting.tabs.utility",
             CraftingTab::Weapon => "hud.crafting.tabs.weapon",
             CraftingTab::Bag => "hud.crafting.tabs.bag",
+            CraftingTab::Material => "hud.crafting.tabs.material",
         }
     }
 
@@ -176,6 +178,7 @@ impl CraftingTab {
             CraftingTab::Utility => imgs.icon_utility,
             CraftingTab::Weapon => imgs.icon_weapon,
             CraftingTab::Bag => imgs.icon_bag,
+            CraftingTab::Material => imgs.icon_material,
         }
     }
 
@@ -189,6 +192,9 @@ impl CraftingTab {
             },
             CraftingTab::Glider => matches!(item.kind(), ItemKind::Glider(_)),
             CraftingTab::Potion => item.tags().contains(&ItemTag::Potion),
+            CraftingTab::Material => {
+                item.tags().contains(&ItemTag::MetalIngot) | item.tags().contains(&ItemTag::Textile)
+            },
             CraftingTab::Bag => item.tags().contains(&ItemTag::Bag),
             CraftingTab::Tool => item.tags().contains(&ItemTag::CraftingTool),
             CraftingTab::Utility => item.tags().contains(&ItemTag::Utility),
@@ -691,6 +697,7 @@ impl<'a> Widget for Crafting<'a> {
                     Some(SpriteKind::Forge) => "Forge",
                     Some(SpriteKind::Loom) => "Loom",
                     Some(SpriteKind::SpinningWheel) => "SpinningWheel",
+                    Some(SpriteKind::TanningRack) => "TanningRack",
                     None => "CraftsmanHammer",
                     _ => "CraftsmanHammer",
                 };
@@ -713,6 +720,7 @@ impl<'a> Widget for Crafting<'a> {
                     Some(SpriteKind::Forge) => "hud.crafting.forge",
                     Some(SpriteKind::Loom) => "hud.crafting.loom",
                     Some(SpriteKind::SpinningWheel) => "hud.crafting.spinning_wheel",
+                    Some(SpriteKind::TanningRack) => "hud.crafting.tanning_rack",
                     _ => "",
                 };
                 Text::new(&self.localized_strings.get(station_name))
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 3619f0b1cb..8ebd664e2c 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -107,6 +107,7 @@ image_ids! {
         icon_utility: "voxygen.element.ui.crafting.icons.utilities",
         icon_weapon: "voxygen.element.ui.crafting.icons.weapons",
         icon_bag: "voxygen.element.items.item_bag_leather_large",
+        icon_material: "voxygen.element.ui.crafting.icons.weapons",
 
         // Group Window
         member_frame: "voxygen.element.ui.groups.group_member_frame",
diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs
index e880dc77bd..15287cc95e 100644
--- a/voxygen/src/scene/terrain/watcher.rs
+++ b/voxygen/src/scene/terrain/watcher.rs
@@ -121,6 +121,9 @@ impl BlocksOfInterest {
                         Some(SpriteKind::Forge) => {
                             interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle)))
                         },
+                        Some(SpriteKind::TanningRack) => {
+                            interactables.push((pos, Interaction::Craft(CraftingTab::Material)))
+                        },
                         Some(SpriteKind::SpinningWheel) => {
                             interactables.push((pos, Interaction::Craft(CraftingTab::All)))
                         },
diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs
index 82cbc83a78..a71b3f30a7 100644
--- a/world/src/layer/scatter.rs
+++ b/world/src/layer/scatter.rs
@@ -106,6 +106,15 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
                 Some((100.0, 0.15)),
             )
         }),
+        (WildFlax, false, |c, col| {
+            (
+                close(c.temp, 0.0, 0.7).min(close(c.humidity, CONFIG.jungle_hum, 0.4))
+                    * col.tree_density
+                    * MUSH_FACT
+                    * 600.0,
+                Some((100.0, 0.15)),
+            )
+        }),
         // Herbs and Spices
         (LingonBerry, false, |c, _| {
             (
diff --git a/world/src/site/settlement/building/archetype/house.rs b/world/src/site/settlement/building/archetype/house.rs
index 3f4ef98141..71c5516e4c 100644
--- a/world/src/site/settlement/building/archetype/house.rs
+++ b/world/src/site/settlement/building/archetype/house.rs
@@ -524,13 +524,13 @@ impl Archetype for House {
                         && center_offset.map(|e| e % 3 == 0).reduce_and()
                         && self
                             .noise
-                            .chance(Vec3::new(center_offset.x, center_offset.y, z), 0.2)
+                            .chance(Vec3::new(center_offset.x, center_offset.y, z), 0.8)
                     {
                         let furniture = match self.noise.get(Vec3::new(
                             center_offset.x,
                             center_offset.y,
                             z + 100,
-                        )) % 11
+                        )) % 12
                         {
                             0..=1 => SpriteKind::Crate,
                             2 => SpriteKind::Bench,
@@ -542,6 +542,7 @@ impl Archetype for House {
                             8 => SpriteKind::Forge,
                             9 => SpriteKind::Loom,
                             10 => SpriteKind::SpinningWheel,
+                            11 => SpriteKind::TanningRack,
                             _ => unreachable!(),
                         };