This repository has been archived by the owner on Nov 1, 2024. It is now read-only.
forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ShuttleGuns
- Loading branch information
Showing
4,021 changed files
with
240,204 additions
and
157,255 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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
Validating CODEOWNERS rules …
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,7 @@ jobs: | |
chmod 600 ~/.ssh/id_rsa | ||
echo "HOST *" > ~/.ssh/config | ||
echo "StrictHostKeyChecking no" >> ~/.ssh/config | ||
git -c submodule.Secrets.update=checkout submodule update --init | ||
git clone [email protected]:corvax-nexus/secrets.git Secrets | ||
cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets | ||
cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer | ||
cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets | ||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,8 +2,3 @@ | |
path = RobustToolbox | ||
url = https://github.com/space-wizards/RobustToolbox.git | ||
branch = master | ||
[submodule "Secrets"] | ||
path = Secrets | ||
url = [email protected]:corvax-project/secrets.git | ||
branch = master | ||
update = none |
Oops, something went wrong.