Merge remote-tracking branch 'upstream/master' into Add-Skrellian-SDT…

…F-weapon&armor
ss220club · Oct 14, 2024 · 73ae8a1 · 73ae8a1
2 parents 022a36d + 4e39ce1
commit 73ae8a1
Show file tree

Hide file tree

Showing 284 changed files with 10,376 additions and 8,902 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -54,20 +54,20 @@
           - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**', 'tgui/**']
           - any-glob-to-any-file: [modular_ss220/**]
       - base-branch: 'master'
-      - head-branch: '^(?!merge-upstream$).*'
+      - head-branch: '^(?!merge[-_]upstream$).*'
 
 ':finnadie: НЕ МОДУЛЬНО':
   - all:
       - changed-files:
           - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**']
           - all-globs-to-all-files: '!modular_ss220/**'
       - base-branch: 'master'
-      - head-branch: '^(?!merge-upstream$).*'
+      - head-branch: '^(?!merge[-_]upstream$).*'
 
 ':pray: Слияние с восходящим потоком':
   - all:
       - base-branch: 'master'
-      - head-branch: 'merge-upstream'
+      - head-branch: 'merge[-_]upstream'
 
 ':pencil: Перевод':
   - base-branch: 'translate'