Merge branch 'Fansana:master' into Nudity-Permit

Fansana · Jul 13, 2024 · 28b1b81 · 28b1b81
2 parents c592b74 + d157f88
commit 28b1b81
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4051,7 +4051,7 @@ Entries:
     - type: Add
       message: >-
         Glass/Crystal shards and floor tiles now deal damage and embed in
-        victims when colliding with them. 
+        victims when colliding with them.
   id: 6107
   time: '2024-05-11T01:23:00.0000000+00:00'
 - author: FoxxoTrystan
@@ -4262,7 +4262,7 @@ Entries:
     - type: Fix
       message: >-
         Spent bullet casings now fly away from a shooter in a cinematic manner,
-        rather than fall at their feet. 
+        rather than fall at their feet.
   id: 6133
   time: '2024-07-01T22:37:29.0000000+00:00'
 - author: WarMechanic

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -0,0 +1,7 @@
+Name: Floof
+Order: 1
+Entries:
+- author: FoxxoTrystan
+  changes:
+  - {message: 'Created the Floof Station changelog.', type: Add}
+  time: '2024-7-12T00:00:00.0000000+00:00'
diff --git a/Resources/Locale/en-US/changelog/changelog-window.ftl b/Resources/Locale/en-US/changelog/changelog-window.ftl
@@ -10,5 +10,7 @@ changelog-version-tag = version v{ $version }
 changelog-button = Changelog
 changelog-button-new-entries = Changelog (new!)
 
-changelog-tab-title-Changelog = Floof Station
-changelog-tab-title-Admin = Floof Station Admin
+changelog-tab-title-Changelog = Einstein Engines
+changelog-tab-title-Admin = Einstein Engines Admin
+
+changelog-tab-title-Floof = Floof Station