Merge branch 'master' into Balance-is-myth

Lost-Paradise-Project · Jan 2, 2025 · 383ede2 · 383ede2
2 parents 56a9907 + 810939c
commit 383ede2
Show file tree

Hide file tree

Showing 27 changed files with 1,607,631 additions and 300,909 deletions.
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -72,6 +72,14 @@ public sealed class PostMapInitTest
             "H_LPPAsterisk", //LPP
             "H_LPPNormandy", //LPP
             "H_LPPPebble", //LPP
+            "LPPCyberiad", //LPP
+            "NY_LPPAsterisk", //LPP
+            "NY_LPPCyberiad", //LPP
+            "NY_LPPKerberos", //LPP
+            "NY_LPPNormandy", //LPP
+            "NY_PebbleStation", //LPP
+            "NY_Plot_113", //LPP
+            "Plot_113", //LPP
             "Gax",
             "Rad"
         };

diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -2981,3 +2981,45 @@
   id: 159
   time: '2024-12-27T17:18:12.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/364
+- author: PowerKAT1
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B 2 \u043D\u043E\
+      \u0432\u044B\u0435 \u043A\u0430\u0440\u0442\u044B - \u041A\u0438\u0431\u0435\
+      \u0440\u0438\u0430\u0434\u0430 \u0438 \u0423\u0447\u0430\u0441\u0442\u043E\u043A\
+      \ 113"
+    type: Add
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E/\u0434\u043E\u0431\u0430\
+      \u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\u0435\u0434\u0435\u043B\u0430\
+      \u043D\u043D\u044B\u0435 \u043D\u043E\u0432\u043E\u0433\u043E\u0434\u043D\u0438\
+      \u0435 \u043A\u0430\u0440\u0442\u044B, \u0432\u043A\u043B\u044E\u0447\u0430\u044F\
+      \ \u043D\u043E\u0432\u044B\u0435 \u043A\u0430\u0440\u0442\u044B"
+    type: Tweak
+  - message: "\u041C\u0435\u043B\u043A\u0438\u0435 \u0444\u0438\u043A\u0441\u044B\
+      \ \u041A\u0435\u0440\u0431\u0435\u0440\u043E\u0441\u0430 \u0438 \u041F\u0435\
+      \u0431\u0431\u043B\u0435"
+    type: Fix
+  id: 160
+  time: '2024-12-28T17:43:00.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/365
+- author: PowerKAT1
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0428\u0430\
+      \u0442\u0442\u043B\u044B \u0443\u0442\u0438\u043B\u0435\u0439 \u043D\u0430 \u043D\
+      \u043E\u0432\u044B\u0445 \u043A\u0430\u0440\u0442\u0430\u0445"
+    type: Fix
+  id: 161
+  time: '2024-12-28T22:09:05.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/367
+- author: PowerKAT1
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\
+      \u0432\u044B\u0435 \u043A\u0430\u0440\u0442\u044B: \u0414\u043E\u0431\u0430\u0432\
+      \u043B\u0435\u043D\u044B \u0422\u043E\u0440\u0433\u043E\u0432\u044B\u0439 \u0441\
+      \u043F\u0443\u0442\u043D\u0438\u043A, \u043D\u0430 \u041A\u0438\u0431\u0435\u0440\
+      \u0438\u0430\u0434\u0435  \u043F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\
+      \u0430\u043D\u0430 \u0441\u0442\u0430\u0440\u0430\u044F \u043A\u0430\u0442\u043E\
+      \u0440\u0433\u0430."
+    type: Fix
+  id: 162
+  time: '2024-12-29T18:59:40.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/370
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
diff --git a/Resources/Locale/en-US/_LostParadise/SponsorMarkingsTier.ftl b/Resources/Locale/en-US/_LostParadise/SponsorMarkingsTier.ftl
@@ -1,6 +1,6 @@
 sponsor-markings-tier-0 = ""
 sponsor-markings-tier-1 = { sponsor-markings-tier-0 };
 sponsor-markings-tier-2 = { sponsor-markings-tier-1 };
-sponsor-markings-tier-3 = { sponsor-markings-tier-2 };HumanHairFingerwave;HumanHairCotton;HumanHairFortuneteller;HumanHairFortunetellerAlt;HumanHairLongdtails;HumanHairLooseSlicked;HumanHairQuadcurls;HumanHairShy;HumanHairSpicy;HumanHairWife;LPPTattooAgent;LPPTattooTear;LPPJaw;LPPRobohead;LPPIronheart;LPPProsthesisLLeg;LPPProsthesisRLeg;LPPProsthesisLHand;LPPProsthesisRHand;LPPProsthesisLWrist;LPPProsthesisRWrist;LPPAlldurak;LPPAllhorn1;LPPAllhorn2;LPPAllhorn3;LPPAllhorn4;LPPAllhorn5;LPPAllhorn6;LPPAlllord;LPPAlloldpain;LPPAlltavrhorn;LPPAlltelehorn;LPPAllvampirehorn;LPPNineTale;LPPAllsuccubus;LPPTailLisichkaBolsh;LPPTailLisichka;LPPTailLisichkaPushok;LPPTailLisichkaPyatna;LPPTailVulptail;LPPSevenTail;LPPTajaranHead7;FelinidFluffyTailRings;FelinidFluffyTail;FelinidAlternativeTail;CatEars;CatTail;BullishHorns;BunnyEars;FoxEars;GoatHorns;BunnyTail;DobleFur;FluffyTail;FoxNineTails;FoxThreeTails;HorseTailCulty;HorseTailLong;SharkTail;TasselTail;FelinidEarsBasic;FelinidEarsCurled;FelinidEarsDroopy;FelinidEarsFuzzy;FelinidEarsStubby;FelinidEarsTall;FelinidEarsTorn;FelinidEarsWide;FelinidTailBasic;FelinidTailBasicWithBow;FelinidTailBasicWithBell;FelinidTailBasicWithBowAndBell
+sponsor-markings-tier-3 = { sponsor-markings-tier-2 };HumanHairFingerwave;HumanHairCotton;HumanHairFortuneteller;HumanHairFortunetellerAlt;HumanHairLongdtails;HumanHairLooseSlicked;HumanHairQuadcurls;HumanHairShy;HumanHairSpicy;HumanHairWife;LPPTattooAgent;LPPTattooTear;LPPJaw;LPPRobohead;LPPIronheart;LPPProsthesisLLeg;LPPProsthesisRLeg;LPPProsthesisLHand;LPPProsthesisRHand;LPPProsthesisLWrist;LPPProsthesisRWrist;LPPAlldurak;LPPAllhorn1;LPPAllhorn2;LPPAllhorn3;LPPAllhorn4;LPPAllhorn5;LPPAllhorn6;LPPAlllord;LPPAlloldpain;LPPAlltavrhorn;LPPAlltelehorn;LPPAllvampirehorn;LPPNineTale;LPPAllsuccubus;LPPTailLisichkaBolsh;LPPTailLisichka;LPPTailLisichkaPushok;LPPTailLisichkaPyatna;LPPTailVulptail;LPPSevenTail;LPPTajaranHead7;FelinidFluffyTailRings;FelinidFluffyTail;FelinidAlternativeTail;CatEars;CatTail;BullishHorns;BunnyEars;FoxEars;GoatHorns;BunnyTail;DobleFur;FluffyTail;FoxNineTails;FoxThreeTails;HorseTailCulty;HorseTailLong;SharkTail;TasselTail;FelinidEarsBasic;FelinidEarsCurled;FelinidEarsDroopy;FelinidEarsFuzzy;FelinidEarsStubby;FelinidEarsTall;FelinidEarsTorn;FelinidEarsWide;FelinidTailBasic;FelinidTailBasicWithBow;FelinidTailBasicWithBell;FelinidTailBasicWithBowAndBell;SlimeCatEars;SlimeCatTail;SlimeCatEarsStubby;SlimeCatEarsCurled;SlimeCatEarsTorn;SlimeCatTailStripes;SlimeFoxEars
 sponsor-markings-tier-4 = { sponsor-markings-tier-3 };
 sponsor-markings-tier-5 = { sponsor-markings-tier-4 };
diff --git a/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl b/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl
@@ -1,6 +1,6 @@
 sponsor-markings-tier-0 = ""
 sponsor-markings-tier-1 = { sponsor-markings-tier-0 };
 sponsor-markings-tier-2 = { sponsor-markings-tier-1 };
-sponsor-markings-tier-3 = { sponsor-markings-tier-2 };HumanHairFingerwave;HumanHairCotton;HumanHairFortuneteller;HumanHairFortunetellerAlt;HumanHairLongdtails;HumanHairLooseSlicked;HumanHairQuadcurls;HumanHairShy;HumanHairSpicy;HumanHairWife;LPPTattooAgent;LPPTattooTear;LPPJaw;LPPRobohead;LPPIronheart;LPPProsthesisLLeg;LPPProsthesisRLeg;LPPProsthesisLHand;LPPProsthesisRHand;LPPProsthesisLWrist;LPPProsthesisRWrist;LPPAlldurak;LPPAllhorn1;LPPAllhorn2;LPPAllhorn3;LPPAllhorn4;LPPAllhorn5;LPPAllhorn6;LPPAlllord;LPPAlloldpain;LPPAlltavrhorn;LPPAlltelehorn;LPPAllvampirehorn;LPPNineTale;LPPAllsuccubus;LPPTailLisichkaBolsh;LPPTailLisichka;LPPTailLisichkaPushok;LPPTailLisichkaPyatna;LPPTailVulptail;LPPSevenTail;LPPTajaranHead7;FelinidFluffyTailRings;FelinidFluffyTail;FelinidAlternativeTail;CatEars;CatTail;BullishHorns;BunnyEars;FoxEars;GoatHorns;BunnyTail;DobleFur;FluffyTail;FoxNineTails;FoxThreeTails;HorseTailCulty;HorseTailLong;SharkTail;TasselTail;FelinidEarsBasic;FelinidEarsCurled;FelinidEarsDroopy;FelinidEarsFuzzy;FelinidEarsStubby;FelinidEarsTall;FelinidEarsTorn;FelinidEarsWide;FelinidTailBasic;FelinidTailBasicWithBow;FelinidTailBasicWithBell;FelinidTailBasicWithBowAndBell
+sponsor-markings-tier-3 = { sponsor-markings-tier-2 };HumanHairFingerwave;HumanHairCotton;HumanHairFortuneteller;HumanHairFortunetellerAlt;HumanHairLongdtails;HumanHairLooseSlicked;HumanHairQuadcurls;HumanHairShy;HumanHairSpicy;HumanHairWife;LPPTattooAgent;LPPTattooTear;LPPJaw;LPPRobohead;LPPIronheart;LPPProsthesisLLeg;LPPProsthesisRLeg;LPPProsthesisLHand;LPPProsthesisRHand;LPPProsthesisLWrist;LPPProsthesisRWrist;LPPAlldurak;LPPAllhorn1;LPPAllhorn2;LPPAllhorn3;LPPAllhorn4;LPPAllhorn5;LPPAllhorn6;LPPAlllord;LPPAlloldpain;LPPAlltavrhorn;LPPAlltelehorn;LPPAllvampirehorn;LPPNineTale;LPPAllsuccubus;LPPTailLisichkaBolsh;LPPTailLisichka;LPPTailLisichkaPushok;LPPTailLisichkaPyatna;LPPTailVulptail;LPPSevenTail;LPPTajaranHead7;FelinidFluffyTailRings;FelinidFluffyTail;FelinidAlternativeTail;CatEars;CatTail;BullishHorns;BunnyEars;FoxEars;GoatHorns;BunnyTail;DobleFur;FluffyTail;FoxNineTails;FoxThreeTails;HorseTailCulty;HorseTailLong;SharkTail;TasselTail;FelinidEarsBasic;FelinidEarsCurled;FelinidEarsDroopy;FelinidEarsFuzzy;FelinidEarsStubby;FelinidEarsTall;FelinidEarsTorn;FelinidEarsWide;FelinidTailBasic;FelinidTailBasicWithBow;FelinidTailBasicWithBell;FelinidTailBasicWithBowAndBell;SlimeCatEars;SlimeCatTail;SlimeCatEarsStubby;SlimeCatEarsCurled;SlimeCatEarsTorn;SlimeCatTailStripes;SlimeFoxEars
 sponsor-markings-tier-4 = { sponsor-markings-tier-3 };
 sponsor-markings-tier-5 = { sponsor-markings-tier-4 };