1.7.0.3

- Added Swarmfly Mech Arm - Added Hullbuster Mech Arm - Added Cometstorm Mech Arm - Added Draco Mech Arm - Added fullbright support for Futara's Fullbright Shader mod. - Fixed a bug where Drone and Augmented support would start spawning countless copies of itself. - Small description change for the Knightfall Logo prop.
Nitrosteel · Mar 19, 2021 · 83aece3 · 83aece3
1 parent 196dbf1
commit 83aece3
Show file tree

Hide file tree

Showing 231 changed files with 172,969 additions and 171,851 deletions.
diff --git a/_previewimage b/_previewimage
diff --git a/dungeons/other/kf_bunker/kf_bunker.dungeon → ...s/encountered/kf_bunker/kf_bunker.dungeon b/dungeons/other/kf_bunker/kf_bunker.dungeon → ...s/encountered/kf_bunker/kf_bunker.dungeon
diff --git a/dungeons/other/kf_bunker/lair_entrance1.json → ...encountered/kf_bunker/lair_entrance1.json b/dungeons/other/kf_bunker/lair_entrance1.json → ...encountered/kf_bunker/lair_entrance1.json
diff --git a/...eons/other/kf_bunker/lair_entrance1a.json → ...ncountered/kf_bunker/lair_entrance1a.json b/...eons/other/kf_bunker/lair_entrance1a.json → ...ncountered/kf_bunker/lair_entrance1a.json
diff --git a/...eons/other/kf_bunker/lair_entrance1b.json → ...ncountered/kf_bunker/lair_entrance1b.json b/...eons/other/kf_bunker/lair_entrance1b.json → ...ncountered/kf_bunker/lair_entrance1b.json
diff --git a/dungeons/other/kf_bunker/lair_room1a.json → ...ns/encountered/kf_bunker/lair_room1a.json b/dungeons/other/kf_bunker/lair_room1a.json → ...ns/encountered/kf_bunker/lair_room1a.json
diff --git a/dungeons/other/kf_bunker/lair_room1b.json → ...ns/encountered/kf_bunker/lair_room1b.json b/dungeons/other/kf_bunker/lair_room1b.json → ...ns/encountered/kf_bunker/lair_room1b.json
diff --git a/dungeons/other/kf_bunker/lair_room2a.json → ...ns/encountered/kf_bunker/lair_room2a.json b/dungeons/other/kf_bunker/lair_room2a.json → ...ns/encountered/kf_bunker/lair_room2a.json
diff --git a/dungeons/other/kf_bunker/lair_room2b.json → ...ns/encountered/kf_bunker/lair_room2b.json b/dungeons/other/kf_bunker/lair_room2b.json → ...ns/encountered/kf_bunker/lair_room2b.json
diff --git a/dungeons/other/kf_bunker/lair_room3a.json → ...ns/encountered/kf_bunker/lair_room3a.json b/dungeons/other/kf_bunker/lair_room3a.json → ...ns/encountered/kf_bunker/lair_room3a.json
diff --git a/dungeons/other/kf_bunker/lair_room3b.json → ...ns/encountered/kf_bunker/lair_room3b.json b/dungeons/other/kf_bunker/lair_room3b.json → ...ns/encountered/kf_bunker/lair_room3b.json
diff --git a/dungeons/other/kf_bunker/lair_room4a.json → ...ns/encountered/kf_bunker/lair_room4a.json b/dungeons/other/kf_bunker/lair_room4a.json → ...ns/encountered/kf_bunker/lair_room4a.json
diff --git a/dungeons/other/kf_bunker/lair_room5a.json → ...ns/encountered/kf_bunker/lair_room5a.json b/dungeons/other/kf_bunker/lair_room5a.json → ...ns/encountered/kf_bunker/lair_room5a.json
diff --git a/dungeons/other/kf_bunker/lair_room5b.json → ...ns/encountered/kf_bunker/lair_room5b.json b/dungeons/other/kf_bunker/lair_room5b.json → ...ns/encountered/kf_bunker/lair_room5b.json
diff --git a/dungeons/other/kf_bunker/lair_room5c.json → ...ns/encountered/kf_bunker/lair_room5c.json b/dungeons/other/kf_bunker/lair_room5c.json → ...ns/encountered/kf_bunker/lair_room5c.json
diff --git a/dungeons/other/kf_bunker/lair_room6a.json → ...ns/encountered/kf_bunker/lair_room6a.json b/dungeons/other/kf_bunker/lair_room6a.json → ...ns/encountered/kf_bunker/lair_room6a.json
diff --git a/dungeons/other/kf_bunker/lair_room6b.json → ...ns/encountered/kf_bunker/lair_room6b.json b/dungeons/other/kf_bunker/lair_room6b.json → ...ns/encountered/kf_bunker/lair_room6b.json
diff --git a/dungeons/other/kf_bunker/lair_room7a.json → ...ns/encountered/kf_bunker/lair_room7a.json b/dungeons/other/kf_bunker/lair_room7a.json → ...ns/encountered/kf_bunker/lair_room7a.json
diff --git a/dungeons/other/kf_bunker/lair_room7b.json → ...ns/encountered/kf_bunker/lair_room7b.json b/dungeons/other/kf_bunker/lair_room7b.json → ...ns/encountered/kf_bunker/lair_room7b.json
diff --git a/...ons/other/kf_bunker/lair_shell_big1a.json → ...countered/kf_bunker/lair_shell_big1a.json b/...ons/other/kf_bunker/lair_shell_big1a.json → ...countered/kf_bunker/lair_shell_big1a.json
diff --git a/...ons/other/kf_bunker/lair_shell_big1b.json → ...countered/kf_bunker/lair_shell_big1b.json b/...ons/other/kf_bunker/lair_shell_big1b.json → ...countered/kf_bunker/lair_shell_big1b.json
diff --git a/...ons/other/kf_bunker/lair_shell_big2a.json → ...countered/kf_bunker/lair_shell_big2a.json b/...ons/other/kf_bunker/lair_shell_big2a.json → ...countered/kf_bunker/lair_shell_big2a.json
diff --git a/...ons/other/kf_bunker/lair_shell_big2b.json → ...countered/kf_bunker/lair_shell_big2b.json b/...ons/other/kf_bunker/lair_shell_big2b.json → ...countered/kf_bunker/lair_shell_big2b.json
diff --git a/...ons/other/kf_bunker/lair_shell_big3a.json → ...countered/kf_bunker/lair_shell_big3a.json b/...ons/other/kf_bunker/lair_shell_big3a.json → ...countered/kf_bunker/lair_shell_big3a.json
diff --git a/...ons/other/kf_bunker/lair_shell_big3b.json → ...countered/kf_bunker/lair_shell_big3b.json b/...ons/other/kf_bunker/lair_shell_big3b.json → ...countered/kf_bunker/lair_shell_big3b.json
diff --git a/...ons/other/kf_bunker/lair_shell_big4a.json → ...countered/kf_bunker/lair_shell_big4a.json b/...ons/other/kf_bunker/lair_shell_big4a.json → ...countered/kf_bunker/lair_shell_big4a.json
diff --git a/...ons/other/kf_bunker/lair_shell_big4b.json → ...countered/kf_bunker/lair_shell_big4b.json b/...ons/other/kf_bunker/lair_shell_big4b.json → ...countered/kf_bunker/lair_shell_big4b.json
diff --git a/...ons/other/kf_bunker/lair_shell_big5a.json → ...countered/kf_bunker/lair_shell_big5a.json b/...ons/other/kf_bunker/lair_shell_big5a.json → ...countered/kf_bunker/lair_shell_big5a.json
diff --git a/...ons/other/kf_bunker/lair_shell_big5b.json → ...countered/kf_bunker/lair_shell_big5b.json b/...ons/other/kf_bunker/lair_shell_big5b.json → ...countered/kf_bunker/lair_shell_big5b.json
diff --git a/...ons/other/kf_bunker/lair_shell_big6a.json → ...countered/kf_bunker/lair_shell_big6a.json b/...ons/other/kf_bunker/lair_shell_big6a.json → ...countered/kf_bunker/lair_shell_big6a.json
diff --git a/...ons/other/kf_bunker/lair_shell_big6b.json → ...countered/kf_bunker/lair_shell_big6b.json b/...ons/other/kf_bunker/lair_shell_big6b.json → ...countered/kf_bunker/lair_shell_big6b.json
diff --git a/...other/kf_bunker/lair_shell_big_end1a.json → ...tered/kf_bunker/lair_shell_big_end1a.json b/...other/kf_bunker/lair_shell_big_end1a.json → ...tered/kf_bunker/lair_shell_big_end1a.json
diff --git a/...other/kf_bunker/lair_shell_big_end1b.json → ...tered/kf_bunker/lair_shell_big_end1b.json b/...other/kf_bunker/lair_shell_big_end1b.json → ...tered/kf_bunker/lair_shell_big_end1b.json
diff --git a/...other/kf_bunker/lair_shell_big_end2a.json → ...tered/kf_bunker/lair_shell_big_end2a.json b/...other/kf_bunker/lair_shell_big_end2a.json → ...tered/kf_bunker/lair_shell_big_end2a.json
diff --git a/...other/kf_bunker/lair_shell_big_end2b.json → ...tered/kf_bunker/lair_shell_big_end2b.json b/...other/kf_bunker/lair_shell_big_end2b.json → ...tered/kf_bunker/lair_shell_big_end2b.json
diff --git a/...other/kf_bunker/lair_shell_big_end3a.json → ...tered/kf_bunker/lair_shell_big_end3a.json b/...other/kf_bunker/lair_shell_big_end3a.json → ...tered/kf_bunker/lair_shell_big_end3a.json
diff --git a/...other/kf_bunker/lair_shell_big_end3b.json → ...tered/kf_bunker/lair_shell_big_end3b.json b/...other/kf_bunker/lair_shell_big_end3b.json → ...tered/kf_bunker/lair_shell_big_end3b.json
diff --git a/.../other/kf_bunker/lair_shell_medium1a.json → ...ntered/kf_bunker/lair_shell_medium1a.json b/.../other/kf_bunker/lair_shell_medium1a.json → ...ntered/kf_bunker/lair_shell_medium1a.json
diff --git a/.../other/kf_bunker/lair_shell_medium1b.json → ...ntered/kf_bunker/lair_shell_medium1b.json b/.../other/kf_bunker/lair_shell_medium1b.json → ...ntered/kf_bunker/lair_shell_medium1b.json
diff --git a/.../other/kf_bunker/lair_shell_medium2a.json → ...ntered/kf_bunker/lair_shell_medium2a.json b/.../other/kf_bunker/lair_shell_medium2a.json → ...ntered/kf_bunker/lair_shell_medium2a.json
diff --git a/.../other/kf_bunker/lair_shell_medium2b.json → ...ntered/kf_bunker/lair_shell_medium2b.json b/.../other/kf_bunker/lair_shell_medium2b.json → ...ntered/kf_bunker/lair_shell_medium2b.json
diff --git a/.../other/kf_bunker/lair_shell_medium3a.json → ...ntered/kf_bunker/lair_shell_medium3a.json b/.../other/kf_bunker/lair_shell_medium3a.json → ...ntered/kf_bunker/lair_shell_medium3a.json
diff --git a/.../other/kf_bunker/lair_shell_medium3b.json → ...ntered/kf_bunker/lair_shell_medium3b.json b/.../other/kf_bunker/lair_shell_medium3b.json → ...ntered/kf_bunker/lair_shell_medium3b.json
diff --git a/...er/kf_bunker/lair_shell_medium_end1a.json → ...ed/kf_bunker/lair_shell_medium_end1a.json b/...er/kf_bunker/lair_shell_medium_end1a.json → ...ed/kf_bunker/lair_shell_medium_end1a.json
diff --git a/...er/kf_bunker/lair_shell_medium_end1b.json → ...ed/kf_bunker/lair_shell_medium_end1b.json b/...er/kf_bunker/lair_shell_medium_end1b.json → ...ed/kf_bunker/lair_shell_medium_end1b.json
diff --git a/...er/kf_bunker/lair_shell_medium_end2a.json → ...ed/kf_bunker/lair_shell_medium_end2a.json b/...er/kf_bunker/lair_shell_medium_end2a.json → ...ed/kf_bunker/lair_shell_medium_end2a.json
diff --git a/...er/kf_bunker/lair_shell_medium_end2b.json → ...ed/kf_bunker/lair_shell_medium_end2b.json b/...er/kf_bunker/lair_shell_medium_end2b.json → ...ed/kf_bunker/lair_shell_medium_end2b.json
diff --git a/...s/other/kf_bunker/lair_shell_small1a.json → ...untered/kf_bunker/lair_shell_small1a.json b/...s/other/kf_bunker/lair_shell_small1a.json → ...untered/kf_bunker/lair_shell_small1a.json
diff --git a/...s/other/kf_bunker/lair_shell_small1b.json → ...untered/kf_bunker/lair_shell_small1b.json b/...s/other/kf_bunker/lair_shell_small1b.json → ...untered/kf_bunker/lair_shell_small1b.json
diff --git a/...her/kf_bunker/lair_shell_small_end1a.json → ...red/kf_bunker/lair_shell_small_end1a.json b/...her/kf_bunker/lair_shell_small_end1a.json → ...red/kf_bunker/lair_shell_small_end1a.json
diff --git a/...her/kf_bunker/lair_shell_small_end1b.json → ...red/kf_bunker/lair_shell_small_end1b.json b/...her/kf_bunker/lair_shell_small_end1b.json → ...red/kf_bunker/lair_shell_small_end1b.json
diff --git a/...eons/other/kf_bunker/lair_vertical1a.json → ...ncountered/kf_bunker/lair_vertical1a.json b/...eons/other/kf_bunker/lair_vertical1a.json → ...ncountered/kf_bunker/lair_vertical1a.json
diff --git a/...eons/other/kf_bunker/lair_vertical1b.json → ...ncountered/kf_bunker/lair_vertical1b.json b/...eons/other/kf_bunker/lair_vertical1b.json → ...ncountered/kf_bunker/lair_vertical1b.json
diff --git a/...eons/other/kf_bunker/lair_vertical2a.json → ...ncountered/kf_bunker/lair_vertical2a.json b/...eons/other/kf_bunker/lair_vertical2a.json → ...ncountered/kf_bunker/lair_vertical2a.json
diff --git a/...eons/other/kf_bunker/lair_vertical2b.json → ...ncountered/kf_bunker/lair_vertical2b.json b/...eons/other/kf_bunker/lair_vertical2b.json → ...ncountered/kf_bunker/lair_vertical2b.json
diff --git a/...eons/other/kf_bunker/lair_vertical3a.json → ...ncountered/kf_bunker/lair_vertical3a.json b/...eons/other/kf_bunker/lair_vertical3a.json → ...ncountered/kf_bunker/lair_vertical3a.json
diff --git a/...eons/other/kf_bunker/lair_vertical3b.json → ...ncountered/kf_bunker/lair_vertical3b.json b/...eons/other/kf_bunker/lair_vertical3b.json → ...ncountered/kf_bunker/lair_vertical3b.json
diff --git a/...eons/other/kf_bunker/lair_vertical4a.json → ...ncountered/kf_bunker/lair_vertical4a.json b/...eons/other/kf_bunker/lair_vertical4a.json → ...ncountered/kf_bunker/lair_vertical4a.json
diff --git a/...eons/other/kf_bunker/lair_vertical4b.json → ...ncountered/kf_bunker/lair_vertical4b.json b/...eons/other/kf_bunker/lair_vertical4b.json → ...ncountered/kf_bunker/lair_vertical4b.json
diff --git a/...eons/other/kf_bunker/lair_vertical5a.json → ...ncountered/kf_bunker/lair_vertical5a.json b/...eons/other/kf_bunker/lair_vertical5a.json → ...ncountered/kf_bunker/lair_vertical5a.json
diff --git a/...eons/other/kf_bunker/lair_vertical5b.json → ...ncountered/kf_bunker/lair_vertical5b.json b/...eons/other/kf_bunker/lair_vertical5b.json → ...ncountered/kf_bunker/lair_vertical5b.json
diff --git a/...eons/other/kf_bunker/lair_vertical6a.json → ...ncountered/kf_bunker/lair_vertical6a.json b/...eons/other/kf_bunker/lair_vertical6a.json → ...ncountered/kf_bunker/lair_vertical6a.json
diff --git a/...eons/other/kf_bunker/lair_vertical6b.json → ...ncountered/kf_bunker/lair_vertical6b.json b/...eons/other/kf_bunker/lair_vertical6b.json → ...ncountered/kf_bunker/lair_vertical6b.json
diff --git a/dungeons/hub/knightfall_citadeltower/knightfall_citadeltower.json b/dungeons/hub/knightfall_citadeltower/knightfall_citadeltower.json
diff --git a/items/armor/knightframe/armor/armor/chestf.png b/items/armor/knightframe/armor/armor/chestf.png
diff --git a/items/armor/knightframe/armor/armor/chestm.png b/items/armor/knightframe/armor/armor/chestm.png
diff --git a/items/armor/knightframe/armor/armor/fsleeve.png b/items/armor/knightframe/armor/armor/fsleeve.png
diff --git a/items/armor/knightframe/armor/armor/head.png b/items/armor/knightframe/armor/armor/head.png
diff --git a/items/armor/knightframe/armor/armor/icons.png b/items/armor/knightframe/armor/armor/icons.png
diff --git a/items/armor/knightframe/armor/armor/knightframe_chest.chest b/items/armor/knightframe/armor/armor/knightframe_chest.chest
@@ -57,29 +57,29 @@
   "itemTags" : [ "tier7armour" ],
 
   "colorOptions" : [
-    // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+	// BLUE
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // BLACK
-    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    { "ffca8afe" : "838383fe", "e0975cfe" : "555555fe", "a85636fe" : "383838fe", "6f2919fe" : "151515fe" },
     // GREY
-    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    { "ffca8afe" : "b5b5b5fe", "e0975cfe" : "808080fe", "a85636fe" : "555555fe", "6f2919fe" : "303030fe" },
     // WHITE
-    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    { "ffca8afe" : "e6e6e6fe", "e0975cfe" : "b6b6b6fe", "a85636fe" : "7b7b7bfe", "6f2919fe" : "373737fe" },
     // RED
-    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    { "ffca8afe" : "f4988cfe", "e0975cfe" : "d93a3afe", "a85636fe" : "932625fe", "6f2919fe" : "601119fe" },
     // ORANGE
-    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    { "ffca8afe" : "ffd495fe", "e0975cfe" : "ea9931fe", "a85636fe" : "af4e00fe", "6f2919fe" : "6e2900fe" },
     // YELLOW
-    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    { "ffca8afe" : "ffffa7fe", "e0975cfe" : "e2c344fe", "a85636fe" : "a46e06fe", "6f2919fe" : "642f00fe" },
     // GREEN
-    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    { "ffca8afe" : "b2e89dfe", "e0975cfe" : "51bd3bfe", "a85636fe" : "247824fe", "6f2919fe" : "144216fe" },
     // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // PURPLE
-    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    { "ffca8afe" : "d29ce7fe", "e0975cfe" : "a451c4fe", "a85636fe" : "6a2284fe", "6f2919fe" : "320c40fe" },
     // PINK
-    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    { "ffca8afe" : "eab3dbfe", "e0975cfe" : "d35eaefe", "a85636fe" : "97276dfe", "6f2919fe" : "59163ffe" },
     // BROWN
-    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    { "ffca8afe" : "ccae7cfe", "e0975cfe" : "a47844fe", "a85636fe" : "754c23fe", "6f2919fe" : "472b13fe" }
   ]
 }
diff --git a/items/armor/knightframe/armor/armor/knightframe_head.head b/items/armor/knightframe/armor/armor/knightframe_head.head
@@ -41,28 +41,28 @@
 
   "colorOptions" : [
 	// BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // BLACK
-    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    { "ffca8afe" : "838383fe", "e0975cfe" : "555555fe", "a85636fe" : "383838fe", "6f2919fe" : "151515fe" },
     // GREY
-    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    { "ffca8afe" : "b5b5b5fe", "e0975cfe" : "808080fe", "a85636fe" : "555555fe", "6f2919fe" : "303030fe" },
     // WHITE
-    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    { "ffca8afe" : "e6e6e6fe", "e0975cfe" : "b6b6b6fe", "a85636fe" : "7b7b7bfe", "6f2919fe" : "373737fe" },
     // RED
-    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    { "ffca8afe" : "f4988cfe", "e0975cfe" : "d93a3afe", "a85636fe" : "932625fe", "6f2919fe" : "601119fe" },
     // ORANGE
-    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    { "ffca8afe" : "ffd495fe", "e0975cfe" : "ea9931fe", "a85636fe" : "af4e00fe", "6f2919fe" : "6e2900fe" },
     // YELLOW
-    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    { "ffca8afe" : "ffffa7fe", "e0975cfe" : "e2c344fe", "a85636fe" : "a46e06fe", "6f2919fe" : "642f00fe" },
     // GREEN
-    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    { "ffca8afe" : "b2e89dfe", "e0975cfe" : "51bd3bfe", "a85636fe" : "247824fe", "6f2919fe" : "144216fe" },
     // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // PURPLE
-    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    { "ffca8afe" : "d29ce7fe", "e0975cfe" : "a451c4fe", "a85636fe" : "6a2284fe", "6f2919fe" : "320c40fe" },
     // PINK
-    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    { "ffca8afe" : "eab3dbfe", "e0975cfe" : "d35eaefe", "a85636fe" : "97276dfe", "6f2919fe" : "59163ffe" },
     // BROWN
-    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    { "ffca8afe" : "ccae7cfe", "e0975cfe" : "a47844fe", "a85636fe" : "754c23fe", "6f2919fe" : "472b13fe" }
   ]
 }
diff --git a/items/armor/knightframe/armor/armor/knightframe_legs.legs b/items/armor/knightframe/armor/armor/knightframe_legs.legs
@@ -27,28 +27,28 @@
 
   "colorOptions" : [
 	// BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // BLACK
-    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    { "ffca8afe" : "838383fe", "e0975cfe" : "555555fe", "a85636fe" : "383838fe", "6f2919fe" : "151515fe" },
     // GREY
-    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    { "ffca8afe" : "b5b5b5fe", "e0975cfe" : "808080fe", "a85636fe" : "555555fe", "6f2919fe" : "303030fe" },
     // WHITE
-    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    { "ffca8afe" : "e6e6e6fe", "e0975cfe" : "b6b6b6fe", "a85636fe" : "7b7b7bfe", "6f2919fe" : "373737fe" },
     // RED
-    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    { "ffca8afe" : "f4988cfe", "e0975cfe" : "d93a3afe", "a85636fe" : "932625fe", "6f2919fe" : "601119fe" },
     // ORANGE
-    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    { "ffca8afe" : "ffd495fe", "e0975cfe" : "ea9931fe", "a85636fe" : "af4e00fe", "6f2919fe" : "6e2900fe" },
     // YELLOW
-    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    { "ffca8afe" : "ffffa7fe", "e0975cfe" : "e2c344fe", "a85636fe" : "a46e06fe", "6f2919fe" : "642f00fe" },
     // GREEN
-    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    { "ffca8afe" : "b2e89dfe", "e0975cfe" : "51bd3bfe", "a85636fe" : "247824fe", "6f2919fe" : "144216fe" },
     // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // PURPLE
-    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    { "ffca8afe" : "d29ce7fe", "e0975cfe" : "a451c4fe", "a85636fe" : "6a2284fe", "6f2919fe" : "320c40fe" },
     // PINK
-    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    { "ffca8afe" : "eab3dbfe", "e0975cfe" : "d35eaefe", "a85636fe" : "97276dfe", "6f2919fe" : "59163ffe" },
     // BROWN
-    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    { "ffca8afe" : "ccae7cfe", "e0975cfe" : "a47844fe", "a85636fe" : "754c23fe", "6f2919fe" : "472b13fe" }
   ]
 }
diff --git a/items/armor/knightframe/armor/armor/legs.png b/items/armor/knightframe/armor/armor/legs.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_commander/head.png b/items/armor/knightframe/armor/helmets/knightframe_commander/head.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_commander/icons.png b/items/armor/knightframe/armor/helmets/knightframe_commander/icons.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_commander/knightframe_commander.head b/items/armor/knightframe/armor/helmets/knightframe_commander/knightframe_commander.head
@@ -21,28 +21,28 @@
 
   "colorOptions" : [
 	// BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // BLACK
-    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    { "ffca8afe" : "838383fe", "e0975cfe" : "555555fe", "a85636fe" : "383838fe", "6f2919fe" : "151515fe" },
     // GREY
-    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    { "ffca8afe" : "b5b5b5fe", "e0975cfe" : "808080fe", "a85636fe" : "555555fe", "6f2919fe" : "303030fe" },
     // WHITE
-    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    { "ffca8afe" : "e6e6e6fe", "e0975cfe" : "b6b6b6fe", "a85636fe" : "7b7b7bfe", "6f2919fe" : "373737fe" },
     // RED
-    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    { "ffca8afe" : "f4988cfe", "e0975cfe" : "d93a3afe", "a85636fe" : "932625fe", "6f2919fe" : "601119fe" },
     // ORANGE
-    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    { "ffca8afe" : "ffd495fe", "e0975cfe" : "ea9931fe", "a85636fe" : "af4e00fe", "6f2919fe" : "6e2900fe" },
     // YELLOW
-    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    { "ffca8afe" : "ffffa7fe", "e0975cfe" : "e2c344fe", "a85636fe" : "a46e06fe", "6f2919fe" : "642f00fe" },
     // GREEN
-    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    { "ffca8afe" : "b2e89dfe", "e0975cfe" : "51bd3bfe", "a85636fe" : "247824fe", "6f2919fe" : "144216fe" },
     // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // PURPLE
-    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    { "ffca8afe" : "d29ce7fe", "e0975cfe" : "a451c4fe", "a85636fe" : "6a2284fe", "6f2919fe" : "320c40fe" },
     // PINK
-    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    { "ffca8afe" : "eab3dbfe", "e0975cfe" : "d35eaefe", "a85636fe" : "97276dfe", "6f2919fe" : "59163ffe" },
     // BROWN
-    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    { "ffca8afe" : "ccae7cfe", "e0975cfe" : "a47844fe", "a85636fe" : "754c23fe", "6f2919fe" : "472b13fe" }
   ]
 }
diff --git a/items/armor/knightframe/armor/helmets/knightframe_explorer/head.png b/items/armor/knightframe/armor/helmets/knightframe_explorer/head.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_explorer/icons.png b/items/armor/knightframe/armor/helmets/knightframe_explorer/icons.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_explorer/knightframe_explorer.head b/items/armor/knightframe/armor/helmets/knightframe_explorer/knightframe_explorer.head
@@ -35,28 +35,28 @@
 
   "colorOptions" : [
 	// BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // BLACK
-    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    { "ffca8afe" : "838383fe", "e0975cfe" : "555555fe", "a85636fe" : "383838fe", "6f2919fe" : "151515fe" },
     // GREY
-    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    { "ffca8afe" : "b5b5b5fe", "e0975cfe" : "808080fe", "a85636fe" : "555555fe", "6f2919fe" : "303030fe" },
     // WHITE
-    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    { "ffca8afe" : "e6e6e6fe", "e0975cfe" : "b6b6b6fe", "a85636fe" : "7b7b7bfe", "6f2919fe" : "373737fe" },
     // RED
-    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    { "ffca8afe" : "f4988cfe", "e0975cfe" : "d93a3afe", "a85636fe" : "932625fe", "6f2919fe" : "601119fe" },
     // ORANGE
-    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    { "ffca8afe" : "ffd495fe", "e0975cfe" : "ea9931fe", "a85636fe" : "af4e00fe", "6f2919fe" : "6e2900fe" },
     // YELLOW
-    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    { "ffca8afe" : "ffffa7fe", "e0975cfe" : "e2c344fe", "a85636fe" : "a46e06fe", "6f2919fe" : "642f00fe" },
     // GREEN
-    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    { "ffca8afe" : "b2e89dfe", "e0975cfe" : "51bd3bfe", "a85636fe" : "247824fe", "6f2919fe" : "144216fe" },
     // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // PURPLE
-    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    { "ffca8afe" : "d29ce7fe", "e0975cfe" : "a451c4fe", "a85636fe" : "6a2284fe", "6f2919fe" : "320c40fe" },
     // PINK
-    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    { "ffca8afe" : "eab3dbfe", "e0975cfe" : "d35eaefe", "a85636fe" : "97276dfe", "6f2919fe" : "59163ffe" },
     // BROWN
-    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    { "ffca8afe" : "ccae7cfe", "e0975cfe" : "a47844fe", "a85636fe" : "754c23fe", "6f2919fe" : "472b13fe" }
   ]
 }
diff --git a/items/armor/knightframe/armor/helmets/knightframe_guardian/head.png b/items/armor/knightframe/armor/helmets/knightframe_guardian/head.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_guardian/icons.png b/items/armor/knightframe/armor/helmets/knightframe_guardian/icons.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_guardian/knightframe_guardian.head b/items/armor/knightframe/armor/helmets/knightframe_guardian/knightframe_guardian.head
@@ -35,28 +35,28 @@
 
   "colorOptions" : [
 	// BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
-	// BLACK
-    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
+    // BLACK
+    { "ffca8afe" : "838383fe", "e0975cfe" : "555555fe", "a85636fe" : "383838fe", "6f2919fe" : "151515fe" },
     // GREY
-    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    { "ffca8afe" : "b5b5b5fe", "e0975cfe" : "808080fe", "a85636fe" : "555555fe", "6f2919fe" : "303030fe" },
     // WHITE
-    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    { "ffca8afe" : "e6e6e6fe", "e0975cfe" : "b6b6b6fe", "a85636fe" : "7b7b7bfe", "6f2919fe" : "373737fe" },
     // RED
-    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    { "ffca8afe" : "f4988cfe", "e0975cfe" : "d93a3afe", "a85636fe" : "932625fe", "6f2919fe" : "601119fe" },
     // ORANGE
-    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    { "ffca8afe" : "ffd495fe", "e0975cfe" : "ea9931fe", "a85636fe" : "af4e00fe", "6f2919fe" : "6e2900fe" },
     // YELLOW
-    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    { "ffca8afe" : "ffffa7fe", "e0975cfe" : "e2c344fe", "a85636fe" : "a46e06fe", "6f2919fe" : "642f00fe" },
     // GREEN
-    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    { "ffca8afe" : "b2e89dfe", "e0975cfe" : "51bd3bfe", "a85636fe" : "247824fe", "6f2919fe" : "144216fe" },
     // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // PURPLE
-    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    { "ffca8afe" : "d29ce7fe", "e0975cfe" : "a451c4fe", "a85636fe" : "6a2284fe", "6f2919fe" : "320c40fe" },
     // PINK
-    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    { "ffca8afe" : "eab3dbfe", "e0975cfe" : "d35eaefe", "a85636fe" : "97276dfe", "6f2919fe" : "59163ffe" },
     // BROWN
-    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    { "ffca8afe" : "ccae7cfe", "e0975cfe" : "a47844fe", "a85636fe" : "754c23fe", "6f2919fe" : "472b13fe" }
   ]
 }
diff --git a/items/armor/knightframe/armor/helmets/knightframe_hunter/head.png b/items/armor/knightframe/armor/helmets/knightframe_hunter/head.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_hunter/icons.png b/items/armor/knightframe/armor/helmets/knightframe_hunter/icons.png
diff --git a/items/armor/knightframe/armor/helmets/knightframe_hunter/knightframe_hunter.head b/items/armor/knightframe/armor/helmets/knightframe_hunter/knightframe_hunter.head
@@ -38,28 +38,28 @@
 
   "colorOptions" : [
 	// BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // BLACK
-    { "ffca8a" : "838383", "e0975c" : "555555", "a85636" : "383838", "6f2919" : "151515" },
+    { "ffca8afe" : "838383fe", "e0975cfe" : "555555fe", "a85636fe" : "383838fe", "6f2919fe" : "151515fe" },
     // GREY
-    { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555555", "6f2919" : "303030" },
+    { "ffca8afe" : "b5b5b5fe", "e0975cfe" : "808080fe", "a85636fe" : "555555fe", "6f2919fe" : "303030fe" },
     // WHITE
-    { "ffca8a" : "e6e6e6", "e0975c" : "b6b6b6", "a85636" : "7b7b7b", "6f2919" : "373737" },
+    { "ffca8afe" : "e6e6e6fe", "e0975cfe" : "b6b6b6fe", "a85636fe" : "7b7b7bfe", "6f2919fe" : "373737fe" },
     // RED
-    { "ffca8a" : "f4988c", "e0975c" : "d93a3a", "a85636" : "932625", "6f2919" : "601119" },
+    { "ffca8afe" : "f4988cfe", "e0975cfe" : "d93a3afe", "a85636fe" : "932625fe", "6f2919fe" : "601119fe" },
     // ORANGE
-    { "ffca8a" : "ffd495", "e0975c" : "ea9931", "a85636" : "af4e00", "6f2919" : "6e2900" },
+    { "ffca8afe" : "ffd495fe", "e0975cfe" : "ea9931fe", "a85636fe" : "af4e00fe", "6f2919fe" : "6e2900fe" },
     // YELLOW
-    { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },
+    { "ffca8afe" : "ffffa7fe", "e0975cfe" : "e2c344fe", "a85636fe" : "a46e06fe", "6f2919fe" : "642f00fe" },
     // GREEN
-    { "ffca8a" : "b2e89d", "e0975c" : "51bd3b", "a85636" : "247824", "6f2919" : "144216" },
+    { "ffca8afe" : "b2e89dfe", "e0975cfe" : "51bd3bfe", "a85636fe" : "247824fe", "6f2919fe" : "144216fe" },
     // BLUE
-    { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" },
+    { "ffca8afe" : "96cbe7fe", "e0975cfe" : "5588d4fe", "a85636fe" : "344495fe", "6f2919fe" : "1a1c51fe" },
     // PURPLE
-    { "ffca8a" : "d29ce7", "e0975c" : "a451c4", "a85636" : "6a2284", "6f2919" : "320c40" },
+    { "ffca8afe" : "d29ce7fe", "e0975cfe" : "a451c4fe", "a85636fe" : "6a2284fe", "6f2919fe" : "320c40fe" },
     // PINK
-    { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" },
+    { "ffca8afe" : "eab3dbfe", "e0975cfe" : "d35eaefe", "a85636fe" : "97276dfe", "6f2919fe" : "59163ffe" },
     // BROWN
-    { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }
+    { "ffca8afe" : "ccae7cfe", "e0975cfe" : "a47844fe", "a85636fe" : "754c23fe", "6f2919fe" : "472b13fe" }
   ]
 }
diff --git a/items/armor/knightframe/armor/helmets/knightframe_scouter/icons.png b/items/armor/knightframe/armor/helmets/knightframe_scouter/icons.png