From cc463afb10d13e98dd0044618298689721b68d3e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 8 Jul 2021 14:52:02 -0400 Subject: [PATCH] Collapse Kadish_kdshVaultIntrYeeshaAdditions. This collapses Sirius's additions pages into: - Kadish_District_kdshVaultIntrYeesha - Kadish_District_Textures as appropriate. All Kadish files have been re-saved to ensure ObjIDs remain consistent. --- compiled/dat/Kadish_District_BuiltIn.prp | 2 +- compiled/dat/Kadish_District_KdshNoteGUI.prp | 2 +- compiled/dat/Kadish_District_Textures.prp | 4 ++-- compiled/dat/Kadish_District_kdshCourtyard.prp | 2 +- compiled/dat/Kadish_District_kdshForest.prp | 4 ++-- compiled/dat/Kadish_District_kdshGlowInTheDark.prp | 2 +- compiled/dat/Kadish_District_kdshPillars.prp | 2 +- compiled/dat/Kadish_District_kdshScope01.prp | 2 +- compiled/dat/Kadish_District_kdshScope02.prp | 2 +- compiled/dat/Kadish_District_kdshScope03.prp | 2 +- compiled/dat/Kadish_District_kdshShadowPath.prp | 4 ++-- compiled/dat/Kadish_District_kdshVaultExtr.prp | 4 ++-- compiled/dat/Kadish_District_kdshVaultExtrYeesha.prp | 4 ++-- compiled/dat/Kadish_District_kdshVaultIntr.prp | 4 ++-- compiled/dat/Kadish_District_kdshVaultIntrYeesha.prp | 4 ++-- compiled/dat/Kadish_District_kdshVaultIntrYeeshaAdditions.prp | 3 --- compiled/dat/Kadish_District_kdshWalkView.prp | 4 ++-- compiled/dat/Kadish_District_kdshYeeshaExcerpts.prp | 2 +- compiled/dat/Kadish_District_kdshYeeshaExcerpts02.prp | 2 +- compiled/dat/Kadish_District_kdshYeeshaExcerpts03.prp | 2 +- compiled/dat/Kadish_District_kdshYeeshaExcerpts04.prp | 2 +- compiled/dat/Kadish_District_opt-kdshCourtyardPartLeaves.prp | 4 ++-- compiled/dat/Kadish_District_opt-kdshCourtyardPhysLeaves.prp | 4 ++-- compiled/dat/Kadish_District_opt-kdshCourtyardProjLights.prp | 2 +- compiled/dat/Kadish_District_opt-kdshWalkViewPartLeaves.prp | 2 +- compiled/dat/Kadish_District_opt-kdshWalkViewPhysLeaves.prp | 4 ++-- compiled/dat/Kadish_District_opt-kdshWalkViewProjLights.prp | 2 +- 27 files changed, 37 insertions(+), 40 deletions(-) delete mode 100644 compiled/dat/Kadish_District_kdshVaultIntrYeeshaAdditions.prp diff --git a/compiled/dat/Kadish_District_BuiltIn.prp b/compiled/dat/Kadish_District_BuiltIn.prp index ce62a4b3..1ff40abb 100644 --- a/compiled/dat/Kadish_District_BuiltIn.prp +++ b/compiled/dat/Kadish_District_BuiltIn.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8305ea6de5addbc24dc50a8ede5b176b326958da5e419a988efe17d486284a1e +oid sha256:050baec8b683f0ffcfa35f0a0685b494e08eef9cd6d993403dcf9807675d057e size 320 diff --git a/compiled/dat/Kadish_District_KdshNoteGUI.prp b/compiled/dat/Kadish_District_KdshNoteGUI.prp index 3164d70a..e3ded5fc 100644 --- a/compiled/dat/Kadish_District_KdshNoteGUI.prp +++ b/compiled/dat/Kadish_District_KdshNoteGUI.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b19ed37e88ff2ea9e45f3451a168d2ab4952e3189f3c19beb4f846a289059def +oid sha256:4e2d95f52cfc4d6c89042477564679cd01861a430d2b955e5718451a6941d877 size 9311 diff --git a/compiled/dat/Kadish_District_Textures.prp b/compiled/dat/Kadish_District_Textures.prp index e1a3d83b..d40168a7 100644 --- a/compiled/dat/Kadish_District_Textures.prp +++ b/compiled/dat/Kadish_District_Textures.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ecfc7bae04a4e8e10590abdf5e8da9270ebe5a60b3ce02d1360cf993aa28fd1 -size 52379959 +oid sha256:4efa96e5b644fdf3e83513152e2050e283a792c80d9e25944e4a164588b8ac50 +size 52401949 diff --git a/compiled/dat/Kadish_District_kdshCourtyard.prp b/compiled/dat/Kadish_District_kdshCourtyard.prp index df6b9fb2..7c50a789 100644 --- a/compiled/dat/Kadish_District_kdshCourtyard.prp +++ b/compiled/dat/Kadish_District_kdshCourtyard.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48f8dc77a604843885749708283f58313c2dc04e13aacfb934957410eda91cca +oid sha256:7b444f10122f39fd2dc76e8c7149792d2cf796e2f841e9f5b139796b897aeec4 size 957509 diff --git a/compiled/dat/Kadish_District_kdshForest.prp b/compiled/dat/Kadish_District_kdshForest.prp index cb487818..b0758d94 100644 --- a/compiled/dat/Kadish_District_kdshForest.prp +++ b/compiled/dat/Kadish_District_kdshForest.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f257b96abb13ce086754ba2130de729c96f7180b0ee5633b51180d3c6f3cd9fe -size 2717130 +oid sha256:ccd23a305b3a1500046c5b2ec5d77009ca6270d84551ef28fd1ca713de9e7fb7 +size 2599186 diff --git a/compiled/dat/Kadish_District_kdshGlowInTheDark.prp b/compiled/dat/Kadish_District_kdshGlowInTheDark.prp index 0996204f..20a31e14 100644 --- a/compiled/dat/Kadish_District_kdshGlowInTheDark.prp +++ b/compiled/dat/Kadish_District_kdshGlowInTheDark.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd99f981bee5aef853432a63136eddbee21a90ce8296ca8fe6c737410f9c70f4 +oid sha256:e4b088bbc28a28714c2a7076a99f052fd8560c069b532487f1d9aed130161190 size 2520284 diff --git a/compiled/dat/Kadish_District_kdshPillars.prp b/compiled/dat/Kadish_District_kdshPillars.prp index 69d136fb..0f2a85f0 100644 --- a/compiled/dat/Kadish_District_kdshPillars.prp +++ b/compiled/dat/Kadish_District_kdshPillars.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3c2ad9c1f4481481e2a8b16d8d743eaa29e79b4d7df029ece81a537af433211 +oid sha256:21c0baea8b466b8c81b35d700dbc9152089eb423041d292d4eb7b50f082f4e81 size 2887352 diff --git a/compiled/dat/Kadish_District_kdshScope01.prp b/compiled/dat/Kadish_District_kdshScope01.prp index 1460ca53..8c19986f 100644 --- a/compiled/dat/Kadish_District_kdshScope01.prp +++ b/compiled/dat/Kadish_District_kdshScope01.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef1b5af7b33d08276555438bd0a555f36341eb4dabee7d14c04d8b6ee61f20bb +oid sha256:249d7ba2ca1771c8cb489185e1746b9ab3af5b5ecd305128881bef4f9fe82801 size 81410 diff --git a/compiled/dat/Kadish_District_kdshScope02.prp b/compiled/dat/Kadish_District_kdshScope02.prp index b653b533..fdd3996b 100644 --- a/compiled/dat/Kadish_District_kdshScope02.prp +++ b/compiled/dat/Kadish_District_kdshScope02.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c1d298632d6e38f0b6c04eb8954b9f70e74c728d451e53f7414454d0f6af1cc +oid sha256:ea12c5b5308eb330fd3ba1d32bd99afb9003368159a024bdf4cf13f2643e6a7b size 94352 diff --git a/compiled/dat/Kadish_District_kdshScope03.prp b/compiled/dat/Kadish_District_kdshScope03.prp index d8fea881..0589cf99 100644 --- a/compiled/dat/Kadish_District_kdshScope03.prp +++ b/compiled/dat/Kadish_District_kdshScope03.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b565b6fc5ecd1b6c431e704874f5988a12d1cab9f48147d6b1f657a6328467b +oid sha256:7476ff75dff76d5a46939ccd75ef93eee8bf0f7e3594302b751df28d16df43c2 size 82864 diff --git a/compiled/dat/Kadish_District_kdshShadowPath.prp b/compiled/dat/Kadish_District_kdshShadowPath.prp index b6423047..aeff245e 100644 --- a/compiled/dat/Kadish_District_kdshShadowPath.prp +++ b/compiled/dat/Kadish_District_kdshShadowPath.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7af066ee0f6f7f09e1e0eaae616e183661958be6e58c96f473ef43c53f5730a6 -size 1189878 +oid sha256:a7109295b9f2940d524e76fed2213b96ad9fdd5b2782194edd97c41ceb71db7a +size 1102849 diff --git a/compiled/dat/Kadish_District_kdshVaultExtr.prp b/compiled/dat/Kadish_District_kdshVaultExtr.prp index d576af05..6ce85226 100644 --- a/compiled/dat/Kadish_District_kdshVaultExtr.prp +++ b/compiled/dat/Kadish_District_kdshVaultExtr.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:835ffeafd41f61c5547914fc3b31ecb14cd17a2c4536400486cf10b26f11165e -size 1210327 +oid sha256:5a9b9419142f9bfcae9b6f97ace8632dd651bf038505c077ddc9824c372317b1 +size 1171185 diff --git a/compiled/dat/Kadish_District_kdshVaultExtrYeesha.prp b/compiled/dat/Kadish_District_kdshVaultExtrYeesha.prp index ae61cc2b..3639faf0 100644 --- a/compiled/dat/Kadish_District_kdshVaultExtrYeesha.prp +++ b/compiled/dat/Kadish_District_kdshVaultExtrYeesha.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba295207248eba60ddd12317ecdcbc89c8f5cc34cb10a1ff8aac035658429cfb -size 999396 +oid sha256:bb2e0527b6d7282998b28915c6e210f2ca88d9c1e1fd4d5b7d482f59d5e70011 +size 988658 diff --git a/compiled/dat/Kadish_District_kdshVaultIntr.prp b/compiled/dat/Kadish_District_kdshVaultIntr.prp index 83a224b5..3f5b3e3c 100644 --- a/compiled/dat/Kadish_District_kdshVaultIntr.prp +++ b/compiled/dat/Kadish_District_kdshVaultIntr.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab7cc142ed8fdacc8e2cbb01ff93aec5a00423c7eb43d4585596a3f1e01b501b -size 1217576 +oid sha256:b4eeec39db03221f7ea897397746426c21d0cdd63b4d1695d68ae0c80e31caf2 +size 1170216 diff --git a/compiled/dat/Kadish_District_kdshVaultIntrYeesha.prp b/compiled/dat/Kadish_District_kdshVaultIntrYeesha.prp index 3af59222..af4b538b 100644 --- a/compiled/dat/Kadish_District_kdshVaultIntrYeesha.prp +++ b/compiled/dat/Kadish_District_kdshVaultIntrYeesha.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fc9a1807002a188836f3d466fcf17d2fe05859d670c8977b89b42b8cff94ef0 -size 551518 +oid sha256:98a2dfcb7f47343113f15a4b8d2e5fb56903fcc8b85950ed7abadd2351173633 +size 595444 diff --git a/compiled/dat/Kadish_District_kdshVaultIntrYeeshaAdditions.prp b/compiled/dat/Kadish_District_kdshVaultIntrYeeshaAdditions.prp deleted file mode 100644 index 534636f8..00000000 --- a/compiled/dat/Kadish_District_kdshVaultIntrYeeshaAdditions.prp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8450282d84dd111d74d74a15c02b8698fde79eea373c4483daaee3130d6920c9 -size 129168 diff --git a/compiled/dat/Kadish_District_kdshWalkView.prp b/compiled/dat/Kadish_District_kdshWalkView.prp index 5fc4c978..fc58246b 100644 --- a/compiled/dat/Kadish_District_kdshWalkView.prp +++ b/compiled/dat/Kadish_District_kdshWalkView.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efb638f1ed7755c70a370438e1d4f8260e1f76ecaff5acfed642a74ce01b81d4 -size 2418262 +oid sha256:d9792a8bb721b06ab1cb18e181b29bc53405fcba900ffc57cb09f42bc0e1e835 +size 2373714 diff --git a/compiled/dat/Kadish_District_kdshYeeshaExcerpts.prp b/compiled/dat/Kadish_District_kdshYeeshaExcerpts.prp index b0f09cf3..29349c0f 100644 --- a/compiled/dat/Kadish_District_kdshYeeshaExcerpts.prp +++ b/compiled/dat/Kadish_District_kdshYeeshaExcerpts.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f78cbf195e8b8a7400f683aa9d82c6a19d07930787d38d1d18906824f6b2b972 +oid sha256:7373812236ce3c5b6f93d6dba8df6343ffb7913ac849070e5e9e474474d6b52d size 4973 diff --git a/compiled/dat/Kadish_District_kdshYeeshaExcerpts02.prp b/compiled/dat/Kadish_District_kdshYeeshaExcerpts02.prp index 6ec09cb1..5ef73756 100644 --- a/compiled/dat/Kadish_District_kdshYeeshaExcerpts02.prp +++ b/compiled/dat/Kadish_District_kdshYeeshaExcerpts02.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c014fcb608310ea1d2e72eb81aa930c6ab3998a9c4e1e93d89420ea863226a8 +oid sha256:81aa47a71c8c8b93e37ac4273f3394f712a179243c18628260974561386eac39 size 4744 diff --git a/compiled/dat/Kadish_District_kdshYeeshaExcerpts03.prp b/compiled/dat/Kadish_District_kdshYeeshaExcerpts03.prp index f027224b..556b13b3 100644 --- a/compiled/dat/Kadish_District_kdshYeeshaExcerpts03.prp +++ b/compiled/dat/Kadish_District_kdshYeeshaExcerpts03.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7442b4052cbcea58675a92c54d7991b1dff86667c0b47525a5fd9162e5767d57 +oid sha256:a142a6d71f5aa6a789b2e18693bda57bb4e8299f6dc50ff6526e5353363c670d size 4758 diff --git a/compiled/dat/Kadish_District_kdshYeeshaExcerpts04.prp b/compiled/dat/Kadish_District_kdshYeeshaExcerpts04.prp index d7d197a6..9ce3e79c 100644 --- a/compiled/dat/Kadish_District_kdshYeeshaExcerpts04.prp +++ b/compiled/dat/Kadish_District_kdshYeeshaExcerpts04.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b235ca5b99fa781a5c1c6dcb70f0b4fad9ed31d086ba45236188b80f22e2a2d +oid sha256:aff7db10ad27ab528c4a3df180036cb48c9caa830139be14f29b1f93358d98f5 size 4758 diff --git a/compiled/dat/Kadish_District_opt-kdshCourtyardPartLeaves.prp b/compiled/dat/Kadish_District_opt-kdshCourtyardPartLeaves.prp index 2d1ef9aa..ba250f19 100644 --- a/compiled/dat/Kadish_District_opt-kdshCourtyardPartLeaves.prp +++ b/compiled/dat/Kadish_District_opt-kdshCourtyardPartLeaves.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5a290dd657729dcc51ed9b296881f383199df7abdaf90ba22dce3ed759c5972 -size 23250 +oid sha256:d981e1cbccb780900f15fac08468229aa19c6d1e3cbf7e679fb86dd1bdc9b72c +size 23110 diff --git a/compiled/dat/Kadish_District_opt-kdshCourtyardPhysLeaves.prp b/compiled/dat/Kadish_District_opt-kdshCourtyardPhysLeaves.prp index b32680e2..9a3233eb 100644 --- a/compiled/dat/Kadish_District_opt-kdshCourtyardPhysLeaves.prp +++ b/compiled/dat/Kadish_District_opt-kdshCourtyardPhysLeaves.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52f1be56568dcef6a4685afb64a03bb4c507f08af5e466dccfa6840ab093036b -size 530711 +oid sha256:83e5b5e0f5874667dce76c860aede545abe588fd85e243d1d965fec965263309 +size 294209 diff --git a/compiled/dat/Kadish_District_opt-kdshCourtyardProjLights.prp b/compiled/dat/Kadish_District_opt-kdshCourtyardProjLights.prp index 37be46c8..3d7cd5fe 100644 --- a/compiled/dat/Kadish_District_opt-kdshCourtyardProjLights.prp +++ b/compiled/dat/Kadish_District_opt-kdshCourtyardProjLights.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0242267e16eb9f798814ef39166d4fb62e3ea76df93ef9e282ad67c1982dc2d9 +oid sha256:d380581d9261c08e7ca19fce0402f19a26278a73f00298684301abb7db0ff2d0 size 9173 diff --git a/compiled/dat/Kadish_District_opt-kdshWalkViewPartLeaves.prp b/compiled/dat/Kadish_District_opt-kdshWalkViewPartLeaves.prp index 223247d0..c0cc116b 100644 --- a/compiled/dat/Kadish_District_opt-kdshWalkViewPartLeaves.prp +++ b/compiled/dat/Kadish_District_opt-kdshWalkViewPartLeaves.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:763034091bac62cd81a1bcf4c31b06c5ae44f4dc19eb2b3f373763ca6f8dd274 +oid sha256:4b9a871e2c25abd5fc7ba7b147fc881b88beb84e1cf4c34bd46872f3cdae2e0e size 17681 diff --git a/compiled/dat/Kadish_District_opt-kdshWalkViewPhysLeaves.prp b/compiled/dat/Kadish_District_opt-kdshWalkViewPhysLeaves.prp index 21de3955..ab6af784 100644 --- a/compiled/dat/Kadish_District_opt-kdshWalkViewPhysLeaves.prp +++ b/compiled/dat/Kadish_District_opt-kdshWalkViewPhysLeaves.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b4ed60b83c34c0e0cfbe8035c2b5c0eea5d492f8a7ddd546658737252a7f76c -size 127483 +oid sha256:f55da7e4de8c2d896749af426b11c859e6ced5d0585e8912e54783b14a8f1328 +size 70525 diff --git a/compiled/dat/Kadish_District_opt-kdshWalkViewProjLights.prp b/compiled/dat/Kadish_District_opt-kdshWalkViewProjLights.prp index 7aa3029a..290b3cb0 100644 --- a/compiled/dat/Kadish_District_opt-kdshWalkViewProjLights.prp +++ b/compiled/dat/Kadish_District_opt-kdshWalkViewProjLights.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f26b80dcecf649672ae817e94342b8dd585d3cbec13f4206e67d2798b86eae8 +oid sha256:6e37231fb5fe23da7c50c4d2a9949929d3a1c4f410c6fa9b3791f40287182b46 size 1682