Merge branch 'master' into ed-04-08-2025-upstream-sync

2025-08-04 13:38:49 +03:00
parent e9199b4e77 133c927f0f
commit 70bf2e1cf3
144 changed files with 17364 additions and 370055 deletions
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -69,7 +69,7 @@ namespace Content.IntegrationTests.Tests
            "MeteorArena",
            "Comoss",
            "Venicialis",
-            "Frigid_Coast",
+            //"NautilusShip",
            //CrystallEdge Map replacement end
        };