-
Notifications
You must be signed in to change notification settings - Fork 642
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into pr/757
- Loading branch information
Showing
6,739 changed files
with
1,938,230 additions
and
1,688,672 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
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 |
|---|---|---|
| @@ -1,80 +1,15 @@ | ||
| # POI's | ||
| Frontier: true | ||
| nfsd: true | ||
|
|
||
| anomalouslab: | ||
| - WallPlastitaniumIndestructible | ||
| - WallPlastitanium | ||
| - PlastitaniumWindow | ||
| Cove: | ||
| - WallPlastitanium | ||
| - HighSecDoor | ||
| Lodge: | ||
| - WallPlastitanium | ||
| - HighSecDoor | ||
|
|
||
|
|
||
| # TECHNICAL DEBT BELOW. These ones were added to this list to ensure other PR's would not break upon merging. It is | ||
| # the intention for this list to become empty in separate PR's. | ||
| Esquire: | ||
| - ToyFigurineSecurity | ||
| - AirlockSecurity | ||
| - SignSec | ||
| Bison: | ||
| - WallPlastitanium | ||
| - WallPlastitaniumDiagonal | ||
| Sprinter: | ||
| - WallPlastitanium | ||
| - IntercomSecurity | ||
| - IntercomCommand | ||
| Courser: | ||
| - HighSecDoor | ||
| Metastable: | ||
| - SignSec | ||
| DartX: | ||
| - HighSecDoor | ||
| gourd: | ||
| - HoloprojectorSecurity | ||
| Praeda: | ||
| - ClothingEyesGlassesSecurity | ||
| - EncryptionKeyCommand | ||
| - EncryptionKeyEngineering | ||
| Pheonix: | ||
| - DebugSubstation | ||
| - WallPlastitanium | ||
| Spectre: | ||
| - AirlockSecurity | ||
| - EncryptionKeyMedicalScience | ||
| Bazaar: | ||
| - AirlockSecurity | ||
| Anchor: | ||
| - AirlockSecurity | ||
| - IntercomCommand | ||
| DecadeDove: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| RosebudMKI: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| - EncryptionKeyScience | ||
| - EncryptionKeyService | ||
| Dragonfly: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| Opportunity: | ||
| - EncryptionKeySecurity | ||
| RosebudMKII: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| - EncryptionKeyScience | ||
| - EncryptionKeyService | ||
| Crescent: | ||
| - EncryptionKeyScience | ||
| - IntercomCommand | ||
| Pathfinder: | ||
| - IntercomCommand | ||
| Schooner: | ||
| - IntercomCommand | ||
| Marauder: | ||
| - IntercomCommand | ||
| Empress: | ||
| - IntercomAll | ||
| #DartX: | ||
| # - HighSecDoor |
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 |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -14,25 +14,32 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Install dependencies | ||
| run: sudo apt-get install -y python3-paramiko | ||
| run: sudo apt-get install -y python3-paramiko python3-lxml | ||
|
|
||
| - uses: actions/[email protected] | ||
| with: | ||
| submodules: 'recursive' | ||
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Get Engine Tag | ||
| run: | | ||
| cd RobustToolbox | ||
| git fetch --depth=1 | ||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
| - name: Build Packaging | ||
| run: dotnet build Content.Packaging --configuration Release --no-restore /m | ||
|
|
||
| - name: Package server | ||
| run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64 | ||
|
|
||
| - name: Package client | ||
| run: | | ||
| Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64 | ||
| Tools/package_client_build.py | ||
| run: dotnet run --project Content.Packaging client --no-wipe-release | ||
|
|
||
| - name: Update Build Info | ||
| run: Tools/gen_build_info.py | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -51,15 +51,19 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
| - name: Build Packaging | ||
| run: dotnet build Content.Packaging --configuration Release --no-restore /m | ||
|
|
||
| - name: Package server | ||
| run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64 | ||
|
|
||
| - name: Package client | ||
| run: | | ||
| Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64 | ||
| Tools/package_client_build.py | ||
| run: dotnet run --project Content.Packaging client --no-wipe-release | ||
|
|
||
| - name: Update Build Info | ||
| run: Tools/gen_build_info.py | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -24,9 +24,29 @@ jobs: | |
| # TODO | ||
| #- name: Get this week's Patreons | ||
| # run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml | ||
|
|
||
| # MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL | ||
|
|
||
|
|
||
| # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. | ||
| # Uncomment this and comment the other line if you do this. | ||
| # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches | ||
|
|
||
| #- name: Commit new credit files | ||
| # uses: stefanzweifel/git-auto-commit-action@v4 | ||
| # with: | ||
| # commit_message: Update Credits | ||
| # commit_author: PJBot <[email protected]> | ||
|
|
||
| # This will make a PR | ||
| - name: Set current date as env variable | ||
| run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV | ||
|
|
||
| - name: Commit new credit files | ||
| uses: stefanzweifel/git-auto-commit-action@v4 | ||
| - name: Create Pull Request | ||
| uses: peter-evans/create-pull-request@v5 | ||
| with: | ||
| commit_message: Update Credits | ||
| commit_author: PJBot <[email protected]> | ||
| commit-message: Update Credits | ||
| title: Update Credits | ||
| body: This is an automated Pull Request. This PR updates the github contributors in the credits section. | ||
| author: PJBot <[email protected]> | ||
| branch: automated/credits-${{env.NOW}} | ||
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 |
|---|---|---|
|
|
@@ -26,7 +26,7 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
| - name: Install dependencies | ||
| run: dotnet restore | ||
| - name: Build | ||
|
|
||
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
Oops, something went wrong.