Merge branch 'master' into property_rebalance

cmss13-devs · May 24, 2024 · 8999e2e · 8999e2e
2 parents 6aeac91 + df59523
commit 8999e2e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-6289.yml b/html/changelogs/AutoChangeLog-pr-6289.yml
diff --git a/html/changelogs/AutoChangeLog-pr-6309.yml b/html/changelogs/AutoChangeLog-pr-6309.yml
diff --git a/html/changelogs/AutoChangeLog-pr-6319.yml b/html/changelogs/AutoChangeLog-pr-6319.yml
diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml
@@ -272,3 +272,10 @@
 2024-05-23:
   Drathek:
   - ui: TGSay is now opened the same way it used to for more responsiveness
+2024-05-24:
+  Drathek:
+  - bugfix: Fixed some winset errors with some nanoui windows
+  - admin: Fixed the adjust_predator_round verb
+  TheGamerdk:
+  - rscadd: Adds a sensor tower to the far East of Shivas, between Med-Sec and the
+      Research labs