Resloved merge conflict for 1.0.4 preperation

thakyZ · Sep 10, 2019 · 713a978 · 713a978
2 parents f35c828 + d2d9cab
commit 713a978
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/_metadata b/_metadata
@@ -7,5 +7,6 @@
   "name" : "NekoMoreHair",
   "steamContentId" : "945265827",
   "tags" : "Character Improvements",
-  "version" : "1.0.3"
+  "version" : "1.0.4"
 }
+
diff --git a/species/neko.species.patch b/species/neko.species.patch
@@ -99,5 +99,50 @@
   { "op": "add", "path": "/genders/1/hair/-", "value": "nekomesu59" },
   { "op": "add", "path": "/genders/1/hair/-", "value": "nekomesu60" },
   { "op": "add", "path": "/genders/1/hair/-", "value": "nekomesu61" },
-  { "op": "add", "path": "/genders/1/hair/-", "value": "nekomesu62" }
+  { "op": "add", "path": "/genders/1/hair/-", "value": "nekomesu62" },
+  { "op": "replace", "path": "/hairColor/0",  "value": { "f5e3c1": "747474", "d9c189": "525252", "a38d59": "363636", "735e3a": "161616", "482c0f": "111111" } },
+  { "op": "replace", "path": "/hairColor/1",  "value": { "f5e3c1": "736758", "d9c189": "50422f", "a38d59": "36261e", "735e3a": "170f0d", "482c0f": "120C0A" } },
+  { "op": "replace", "path": "/hairColor/2",  "value": { "f5e3c1": "987B60", "d9c189": "7f5a39", "a38d59": "5b3523", "735e3a": "3b1f15", "482c0f": "2F1810" } },
+  { "op": "replace", "path": "/hairColor/3",  "value": { "f5e3c1": "B7844A", "d9c189": "a6671d", "a38d59": "915622", "735e3a": "743e1d", "482c0f": "5C3117" } },
+  { "op": "replace", "path": "/hairColor/4",  "value": { "f5e3c1": "EBEB77", "d9c189": "e6e756", "a38d59": "c7ac3f", "735e3a": "a9882f", "482c0f": "876C25" } },
+  { "op": "replace", "path": "/hairColor/5",  "value": { "f5e3c1": "F4EFB5", "d9c189": "f2eba3", "a38d59": "dcd28c", "735e3a": "c2b677", "482c0f": "9B905F" } },
+  { "op": "replace", "path": "/hairColor/6",  "value": { "f5e3c1": "976349", "d9c189": "7d3c1c", "a38d59": "4d240b", "735e3a": "2d1606", "482c0f": "241104" } },
+  { "op": "replace", "path": "/hairColor/7",  "value": { "f5e3c1": "BD5244", "d9c189": "ad2716", "a38d59": "8f1f1b", "735e3a": "731a1a", "482c0f": "5C1414" } },
+  { "op": "replace", "path": "/hairColor/8",  "value": { "f5e3c1": "C6C6C6", "d9c189": "b8b8b8", "a38d59": "828282", "735e3a": "555555", "482c0f": "444444" } },
+  { "op": "replace", "path": "/hairColor/9",  "value": { "f5e3c1": "EEEEEE", "d9c189": "eaeaea", "a38d59": "b8b8b8", "735e3a": "828282", "482c0f": "686868" } },
+  { "op": "replace", "path": "/hairColor/10", "value": { "f5e3c1": "8B8A9D", "d9c189": "6f6d85", "a38d59": "525269", "735e3a": "3e4352", "482c0f": "313541" } },
+  { "op": "replace", "path": "/hairColor/11", "value": { "f5e3c1": "D78EE0", "d9c189": "cd72d9", "a38d59": "ac4da6", "735e3a": "913b86", "482c0f": "742F6B" } },
+  { "op": "replace", "path": "/hairColor/12", "value": { "f5e3c1": "677993", "d9c189": "425879", "a38d59": "343965", "735e3a": "242247", "482c0f": "1C1B38" } },
+  { "op": "replace", "path": "/hairColor/13", "value": { "f5e3c1": "7DA2D2", "d9c189": "5d8bc7", "a38d59": "4d55b0", "735e3a": "2e2a73", "482c0f": "24215C" } },
+  { "op": "replace", "path": "/hairColor/14", "value": { "f5e3c1": "836298", "d9c189": "653b7f", "a38d59": "562e6a", "735e3a": "3f1d4b", "482c0f": "32173C" } },
+  { "op": "replace", "path": "/hairColor/15", "value": { "f5e3c1": "98628A", "d9c189": "7f3b6d", "a38d59": "6a2e53", "735e3a": "4b1d30", "482c0f": "3C1726" } },
+  { "op": "replace", "path": "/hairColor/16", "value": { "f5e3c1": "F2BA5F", "d9c189": "efa838", "a38d59": "be6d1d", "735e3a": "834012", "482c0f": "68320E" } },
+  { "op": "replace", "path": "/hairColor/17", "value": { "f5e3c1": "71D781", "d9c189": "4ece61", "a38d59": "34ae47", "735e3a": "228a38", "482c0f": "1B6E2D" } },
+  { "op": "replace", "path": "/hairColor/18", "value": { "f5e3c1": "629869", "d9c189": "3b7f44", "a38d59": "2e6a38", "735e3a": "1d4b28", "482c0f": "173C20" } },
+  { "op": "replace", "path": "/hairColor/19", "value": { "f5e3c1": "8F8E8B", "d9c189": "74726f", "a38d59": "53504d", "735e3a": "2a251e", "482c0f": "211D18" } },
+  { "op": "replace", "path": "/hairColor/20", "value": { "f5e3c1": "B3D75B", "d9c189": "A1CD33", "a38d59": "83B62A", "735e3a": "688E22", "482c0f": "53711B" } },
+  { "op": "replace", "path": "/hairColor/21", "value": { "f5e3c1": "BFBD93", "d9c189": "B0AD79", "a38d59": "7B764F", "735e3a": "615B3A", "482c0f": "4D482E" } },
+  { "op": "replace", "path": "/hairColor/22", "value": { "f5e3c1": "CFD588", "d9c189": "C3CB6B", "a38d59": "AAB256", "735e3a": "7C842C", "482c0f": "646923" } },
+  { "op": "replace", "path": "/hairColor/23", "value": { "f5e3c1": "99A99D", "d9c189": "809485", "a38d59": "718777", "735e3a": "4A6352", "482c0f": "3B4F41" } },
+  { "op": "replace", "path": "/hairColor/24", "value": { "f5e3c1": "D0B73E", "d9c189": "C5A60E", "a38d59": "AE9027", "735e3a": "8B6F00", "482c0f": "6F5800" } },
+  { "op": "replace", "path": "/hairColor/25", "value": { "f5e3c1": "DBC77B", "d9c189": "D2B95A", "a38d59": "C79B3C", "735e3a": "A2772E", "482c0f": "815F24" } },
+  { "op": "replace", "path": "/hairColor/26", "value": { "f5e3c1": "E3C3A3", "d9c189": "DCB48C", "a38d59": "B38D6B", "735e3a": "875F3C", "482c0f": "6C4C30" } },
+  { "op": "replace", "path": "/hairColor/27", "value": { "f5e3c1": "D4D3A4", "d9c189": "CAC88E", "a38d59": "B0AD79", "735e3a": "817D50", "482c0f": "676440" } },
+  { "op": "replace", "path": "/hairColor/28", "value": { "f5e3c1": "B7DBF5", "d9c189": "A6D2F3", "a38d59": "8DB6EB", "735e3a": "6A8FC5", "482c0f": "54719D" } },
+  { "op": "replace", "path": "/hairColor/29", "value": { "f5e3c1": "89CEE5", "d9c189": "6CC3DF", "a38d59": "4F9BBC", "735e3a": "327DA5", "482c0f": "286484" } },
+  { "op": "replace", "path": "/hairColor/30", "value": { "f5e3c1": "8FA1C8", "d9c189": "748BBB", "a38d59": "697CA9", "735e3a": "49567C", "482c0f": "3A4463" } },
+  { "op": "replace", "path": "/hairColor/31", "value": { "f5e3c1": "BE9FC3", "d9c189": "AE87B5", "a38d59": "946F9D", "735e3a": "6F4D7A", "482c0f": "583D61" } },
+  { "op": "replace", "path": "/hairColor/32", "value": { "f5e3c1": "E7B2D4", "d9c189": "E19FCA", "a38d59": "DB8EB9", "735e3a": "C06A8B", "482c0f": "99546F" } },
+  { "op": "replace", "path": "/hairColor/33", "value": { "f5e3c1": "E2A3A9", "d9c189": "DB8C94", "a38d59": "C37C82", "735e3a": "996167", "482c0f": "7A4D52" } },
+  { "op": "replace", "path": "/hairColor/34", "value": { "f5e3c1": "DC9F97", "d9c189": "D4887E", "a38d59": "B06E76", "735e3a": "8C5055", "482c0f": "704044" } },
+  { "op": "replace", "path": "/hairColor/35", "value": { "f5e3c1": "BB898D", "d9c189": "AB6C71", "a38d59": "945C60", "735e3a": "724245", "482c0f": "5B3437" } },
+  { "op": "replace", "path": "/hairColor/36", "value": { "f5e3c1": "B53333", "d9c189": "A30000", "a38d59": "700000", "735e3a": "550000", "482c0f": "440000" } },
+  { "op": "replace", "path": "/hairColor/37", "value": { "f5e3c1": "D5A888", "d9c189": "CB936B", "a38d59": "B27C56", "735e3a": "8E5B36", "482c0f": "71482B" } },
+  { "op": "replace", "path": "/hairColor/38", "value": { "f5e3c1": "C37657", "d9c189": "B5542E", "a38d59": "A34C24", "735e3a": "8E4120", "482c0f": "713419" } },
+  { "op": "replace", "path": "/hairColor/39", "value": { "f5e3c1": "D68B5E", "d9c189": "CC7036", "a38d59": "B5542E", "735e3a": "A0320A", "482c0f": "802808" } },
+  { "op": "replace", "path": "/hairColor/40", "value": { "f5e3c1": "AB8D33", "d9c189": "977200", "a38d59": "816000", "735e3a": "6C4D00", "482c0f": "563D00" } },
+  { "op": "replace", "path": "/hairColor/41", "value": { "f5e3c1": "AFAFBF", "d9c189": "9C9CB0", "a38d59": "7B7B8F", "735e3a": "5A5A6E", "482c0f": "484858" } },
+  { "op": "replace", "path": "/hairColor/42", "value": { "f5e3c1": "E9E0EB", "d9c189": "E4D9E6", "a38d59": "C9C1CE", "735e3a": "A498AB", "482c0f": "837988" } },
+  { "op": "replace", "path": "/hairColor/43", "value": { "f5e3c1": "F3EBEB", "d9c189": "F0E6E6", "a38d59": "DCD2D2", "735e3a": "B9AFAF", "482c0f": "948C8C" } },
+  { "op": "replace", "path": "/hairColor/44", "value": { "f5e3c1": "DFD4BF", "d9c189": "D8CAAF", "a38d59": "A49A7F", "735e3a": "7D735A", "482c0f": "645C48" } }
 ]