Added method of differing names for 1h and 2h variants of a modular wepaon.

Added all 1h melee weapon models.

assets/common/items/crafting_ing/modular/primary/axe/axe.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 1.0,
             ),
             hand_restriction: None,
-            weapon_name: "Axe",
+            weapon_name: HandednessDependent(
+                one_handed: "Hatchet",
+                two_handed: "Axe",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/axe/battleaxe.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: None,
-            weapon_name: "Battleaxe",
+            weapon_name: HandednessDependent(
+                one_handed: "Cleaver",
+                two_handed: "Battleaxe",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/axe/greataxe.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Greataxe",
+            weapon_name: Universal("Greataxe"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/axe/jagged.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 2.0,
             ),
             hand_restriction: None,
-            weapon_name: "Jagged Axe",
+            weapon_name: HandednessDependent(
+                one_handed: "Tomahawk",
+                two_handed: "Jagged Axe",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/axe/labrys.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Labrys",
+            weapon_name: Universal("Labrys"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/axe/ornate.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: None,
-            weapon_name: "Ornate Axe",
+            weapon_name: HandednessDependent(
+                one_handed: "Kilonda",
+                two_handed: "Ornate Axe",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Poleaxe",
+            weapon_name: Universal("Poleaxe"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/bow/bow.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 1.0,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Bow",
+            weapon_name: Universal("Bow"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/bow/composite.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 2.0,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Composite Bow",
+            weapon_name: Universal("Composite Bow"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/bow/greatbow.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Greatbow",
+            weapon_name: Universal("Greatbow"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/bow/longbow.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Longbow",
+            weapon_name: Universal("Longbow"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/bow/ornate.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Ornate Bow",
+            weapon_name: Universal("Ornate Bow"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/bow/shortbow.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Shortbow",
+            weapon_name: Universal("Shortbow"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/bow/warbow.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Warbow",
+            weapon_name: Universal("Warbow"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/hammer/greathammer.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Greathammer",
+            weapon_name: Universal("Greathammer"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Great Mace",
+            weapon_name: Universal("Great Mace"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 1.0,
             ),
             hand_restriction: None,
-            weapon_name: "Hammer",
+            weapon_name: HandednessDependent(
+                one_handed: "Club",
+                two_handed: "Hammer",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/hammer/maul.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Maul",
+            weapon_name: Universal("Maul"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/hammer/ornate.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: None,
-            weapon_name: "Ornate Hammer",
+            weapon_name: HandednessDependent(
+                one_handed: "Cudgel",
+                two_handed: "Ornate Hammer",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 2.0,
             ),
             hand_restriction: None,
-            weapon_name: "Spiked Mace",
+            weapon_name: HandednessDependent(
+                one_handed: "Mace",
+                two_handed: "Spiked Mace",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/hammer/warhammer.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: None,
-            weapon_name: "Warhammer",
+            weapon_name: HandednessDependent(
+                one_handed: "Mallet",
+                two_handed: "Warhammer",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Arbor",
+            weapon_name: Universal("Arbor"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sceptre/cane.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Cane",
+            weapon_name: Universal("Cane"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 2.0,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Crook",
+            weapon_name: Universal("Crook"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sceptre/crozier.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Crozier",
+            weapon_name: Universal("Crozier"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sceptre/grandsceptre.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Grandsceptre",
+            weapon_name: Universal("Grandsceptre"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sceptre/ornate.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Ornate Sceptre",
+            weapon_name: Universal("Ornate Sceptre"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 1.0,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Sceptre",
+            weapon_name: Universal("Sceptre"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/staff/brand.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Brand",
+            weapon_name: Universal("Brand"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/staff/grandstaff.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Grandstaff",
+            weapon_name: Universal("Grandstaff"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/staff/longpole.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Long Pole",
+            weapon_name: Universal("Long Pole"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/staff/ornate.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Ornate Staff",
+            weapon_name: Universal("Ornate Staff"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/staff/pole.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 2.0,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Pole",
+            weapon_name: Universal("Pole"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/staff/rod.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Rod",
+            weapon_name: Universal("Rod"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/staff/staff.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 1.0,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Staff",
+            weapon_name: Universal("Staff"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sword/greatsword.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Greatsword",
+            weapon_name: Universal("Greatsword"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sword/katana.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: None,
-            weapon_name: "Katana",
+            weapon_name: HandednessDependent(
+                one_handed: "Swiftblade",
+                two_handed: "Katana",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sword/longsword.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 1.0,
             ),
             hand_restriction: None,
-            weapon_name: "Longsword",
+            weapon_name: HandednessDependent(
+                one_handed: "Arming Sword",
+                two_handed: "Longsword",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sword/ornate.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: None,
-            weapon_name: "Ornate Sword",
+            weapon_name: HandednessDependent(
+                one_handed: "Rapier",
+                two_handed: "Ornate Sword",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sword/sabre.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: None,
-            weapon_name: "Sabre",
+            weapon_name: HandednessDependent(
+                one_handed: "Scimitar",
+                two_handed: "Sabre",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron

@@ -15,7 +15,10 @@ ItemDef(
                 buff_strength: 2.0,
             ),
             hand_restriction: None,
-            weapon_name: "Sawblade",
+            weapon_name: HandednessDependent(
+                one_handed: "Sawback",
+                two_handed: "Sawblade",
+            ),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron

@@ -15,7 +15,7 @@ ItemDef(
                 buff_strength: 0.8,
             ),
             hand_restriction: Some(Two),
-            weapon_name: "Zweihander",
+            weapon_name: Universal("Zweihander"),
         )
     ),
     quality: Low,

assets/common/items/crafting_ing/modular/secondary/bow/medium.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: "Medium Bow Limbs",
+    name: "Medium Bow Grip",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(