Merge branch 'master' into wizmerge

Simple-Station · Dec 29, 2024 · 3363ddd · 3363ddd
2 parents c6bee33 + 2500a39
commit 3363ddd
Show file tree

Hide file tree

Showing 2 changed files with 3,544 additions and 2,666 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -8797,3 +8797,10 @@ Entries:
   id: 6592
   time: '2024-12-26T03:50:10.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1370
+- author: SiN Mapping Team
+  changes:
+    - type: Add
+      message: Another big update for Saltern
+  id: 6593
+  time: '2024-12-29T01:51:30.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1372