Merge branch 'new-frontiers-14:master' into 2024-04-11-Vehicle-Inventory

new-frontiers-14 · Apr 23, 2024 · 4c1024f · 4c1024f
2 parents cc63a39 + 69a12c7
commit 4c1024f
Show file tree

Hide file tree

Showing 3 changed files with 853 additions and 823 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4143,3 +4143,9 @@ Entries:
       message: SCAF suit is now void capable, can be researched and printed.
   id: 4928
   time: '2024-04-22T22:53:40.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Added new NSFD sprites to the NSF Whiskey and tweaked decals.
+  id: 4929
+  time: '2024-04-23T00:39:40.0000000+00:00'