From c2ac2525abe4364932537a368cef3e675d92bbf6 Mon Sep 17 00:00:00 2001
From: Martin Benjamins <ictmartin@gmail.com>
Date: Tue, 28 Nov 2023 01:35:13 +0100
Subject: [PATCH] Merge suggestions from #212 (closes #212)

---
 parts/item.csv        | 29 +++++++++++++++++++++++++++++
 parts/placeholder.csv |  7 -------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/parts/item.csv b/parts/item.csv
index ae23aebe..46a37a6e 100644
--- a/parts/item.csv
+++ b/parts/item.csv
@@ -240040,6 +240040,11 @@
 5278888;item/objectcomponents/shoulder/shoulder_cloth_raidpriestemerald_d_01_r_lod03.skin
 5279092;item/objectcomponents/cape/Cape_Special_Explorer_B_01.m2
 5279093;item/objectcomponents/weapon/Misc_1H_Caliper_B_01.m2
+5279610;Item/ObjectComponents/Weapon/Sword_1h_CrystalBroadsword_C_01_Blue.blp
+5279611;Item/ObjectComponents/Weapon/Sword_1h_CrystalBroadsword_C_01_Green.blp
+5279612;Item/ObjectComponents/Weapon/Sword_1h_CrystalBroadsword_C_01_Red.blp
+5279613;Item/ObjectComponents/Weapon/Sword_1h_CrystalBroadsword_C_01_Purple.blp
+5280010;Item/ObjectComponents/Weapon/Sword_1h_CrystalBroadsword_C_01.m2
 5280328;item/objectcomponents/collections/plate_raiddeathknightemerald_d_01_belt00.skin
 5280330;item/objectcomponents/collections/plate_raiddeathknightemerald_d_01_belt_lod01.skin
 5280332;item/objectcomponents/collections/plate_raiddeathknightemerald_d_01_belt_lod02.skin
@@ -243105,7 +243110,31 @@
 5501833;item/objectcomponents/collections/robe_cloth_raidpriestemerald_d_01_Za_f_lod01.skin
 5501834;item/objectcomponents/collections/robe_cloth_raidpriestemerald_d_01_Za_f_lod02.skin
 5501835;item/objectcomponents/collections/robe_cloth_raidpriestemerald_d_01_Za_f_lod03.skin
+5502737;Item/ObjectComponents/Weapon/Bow_1H_Spring_C_01.m2
+5502738;Item/ObjectComponents/Ammo/Arrow_Bow_1H_Spring_C_01.m2
+5502739;Item/ObjectComponents/Weapon/Polearm_2H_Spring_C_01.m2
+5502740;Item/ObjectComponents/Weapon/Staff_2H_Spring_C_01.m2
+5502741;Item/ObjectComponents/Weapon/Axe_1H_Spring_C_01.m2
+5502742;Item/ObjectComponents/Weapon/Knife_1H_Spring_C_01.m2
 5502743;Item/ObjectComponents/Cape/Cape_Special_Butterfly_C_01.m2
+5502783;Item/ObjectComponents/Ammo/Arrow_Bow_1H_Spring_C_01_Color01.blp
+5502784;Item/ObjectComponents/Ammo/Arrow_Bow_1H_Spring_C_01_Color02.blp
+5502785;Item/ObjectComponents/Ammo/Arrow_Bow_1H_Spring_C_01_Color03.blp
+5502786;Item/ObjectComponents/Weapon/Axe_1H_Spring_C_01_Color01.blp
+5502787;Item/ObjectComponents/Weapon/Axe_1H_Spring_C_01_Color02.blp
+5502788;Item/ObjectComponents/Weapon/Axe_1H_Spring_C_01_Color03.blp
+5502789;Item/ObjectComponents/Weapon/Bow_1H_Spring_C_01_Color01.blp
+5502790;Item/ObjectComponents/Weapon/Bow_1H_Spring_C_01_Color02.blp
+5502791;Item/ObjectComponents/Weapon/Bow_1H_Spring_C_01_Color03.blp
+5502792;Item/ObjectComponents/Weapon/Knife_1H_Spring_C_01_Color01.blp
+5502793;Item/ObjectComponents/Weapon/Knife_1H_Spring_C_01_Color02.blp
+5502794;Item/ObjectComponents/Weapon/Knife_1H_Spring_C_01_Color03.blp
+5502795;Item/ObjectComponents/Weapon/Polearm_2H_Spring_C_01_Color01.blp
+5502796;Item/ObjectComponents/Weapon/Polearm_2H_Spring_C_01_Color02.blp
+5502797;Item/ObjectComponents/Weapon/Polearm_2H_Spring_C_01_Color03.blp
+5502798;Item/ObjectComponents/Weapon/Staff_2H_Spring_C_01_Color01.blp
+5502799;Item/ObjectComponents/Weapon/Staff_2H_Spring_C_01_Color02.blp
+5502800;Item/ObjectComponents/Weapon/Staff_2H_Spring_C_01_Color03.blp
 5503218;item/objectcomponents/waist/buckle_armor_hearthstone_c_01.m2
 5503422;Item/ObjectComponents/Cape/Cape_Special_Butterfly_C_0100.skin
 5503423;Item/ObjectComponents/Cape/Cape_Special_Butterfly_C_01_lod01.skin
diff --git a/parts/placeholder.csv b/parts/placeholder.csv
index 44e4aab4..5e126b33 100644
--- a/parts/placeholder.csv
+++ b/parts/placeholder.csv
@@ -101132,7 +101132,6 @@
 5279878;item/objectcomponents/weapon/knife_1h_emeralddreamraid_d_01_5279878.blp
 5279879;item/objectcomponents/weapon/knife_1h_emeralddreamraid_d_01_5279879.blp
 5279880;item/objectcomponents/weapon/knife_1h_emeralddreamraid_d_01_5279880.blp
-5280010;models/unknown/unk_exp09_5280010/5280010.m2
 5280011;models/unknown/unk_exp09_5280010/528001000.skin
 5280012;models/unknown/unk_exp09_5280010/5280010_lod01.skin
 5280013;models/unknown/unk_exp09_5280010/5280010_lod02.skin
@@ -107667,12 +107666,6 @@
 5502734;creature/MagicalOwlbearMount/MagicalOwlbearMount_5502734.blp
 5502735;creature/MagicalOwlbearMount/MagicalOwlbearMount_5502735.blp
 5502736;creature/MagicalOwlbearMount/MagicalOwlbearMount_5502736.blp
-5502737;models/unknown/unk_exp09_5502737/5502737.m2
-5502738;models/unknown/unk_exp09_5502738/5502738.m2
-5502739;models/unknown/unk_exp09_5502739/5502739.m2
-5502740;models/unknown/unk_exp09_5502740/5502740.m2
-5502741;models/unknown/unk_exp09_5502741/5502741.m2
-5502742;models/unknown/unk_exp09_5502742/5502742.m2
 5502745;models/unknown/unk_exp09_5502737/550273700.skin
 5502746;models/unknown/unk_exp09_5502737/5502737_lod01.skin
 5502747;models/unknown/unk_exp09_5502737/5502737_lod02.skin