juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2

Browse Source 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
This commit is contained in:
Ed
2024-09-17 11:54:36 +03:00
parent bc930da84f 5eaac00432
commit cc02a133e0
561 changed files with 55148 additions and 10009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/update-credits.yml vendored
View File

@@ -19,6 +19,8 @@ jobs:
- name: Get this week's Contributors
shell: pwsh
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
run: Tools/dump_github_contributors.ps1 > Resources/Credits/GitHub.txt
# TODO