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

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
This commit is contained in:
Ed
2024-07-12 12:53:42 +03:00
parent e87994ae40 b5e49c9c07
commit 0931c9e7d1
327 changed files with 13173 additions and 13957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/labeler.yml vendored
View File

@@ -5,8 +5,8 @@
"Changes: Map":
- changed-files:
- any-glob-to-any-file:
- 'Resources/Maps/*.yml'
- 'Resources/Prototypes/Maps/*.yml'
- 'Resources/Maps/**/*.yml'
- 'Resources/Prototypes/Maps/**/*.yml'
"Changes: UI":
- changed-files: