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-28-07-2024-upstream

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
This commit is contained in:
Ed
2024-07-28 20:58:48 +03:00
parent 0d345c33b9 fce5269fc0
commit fb40f8cd25
302 changed files with 7542 additions and 4673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/labeler.yml vendored
View File

@@ -12,6 +12,10 @@
- changed-files:
- any-glob-to-any-file: '**/*.xaml*'
"Changes: Shaders":
- changed-files:
- any-glob-to-any-file: '**/*.swsl'
"No C#":
- changed-files:
# Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.