-
Notifications
You must be signed in to change notification settings - Fork 524
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new-frontiers-14:master' into 2024-01-22-MachineMagnet
- Loading branch information
Showing
20 changed files
with
4,923 additions
and
2,328 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
752 changes: 370 additions & 382 deletions
752
Resources/Maps/Shuttles/chisel.yml → Resources/Maps/_NF/Shuttles/chisel.yml
Large diffs are not rendered by default.
Oops, something went wrong.
471 changes: 226 additions & 245 deletions
471
Resources/Maps/Shuttles/rigger.yml → Resources/Maps/_NF/Shuttles/gasbender.yml
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.