Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream

# Conflicts: # Resources/Prototypes/Maps/box.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/Maps/oasis.yml # Resources/Prototypes/Maps/origin.yml # Resources/Prototypes/lobbyscreens.yml
2024-06-30 11:18:30 +03:00
parent 1dbe308527 6f8369ed6b
commit dbdb81381b
417 changed files with 19705 additions and 14193 deletions
--- a/.github/workflows/labeler-untriaged.yml
+++ b/.github/workflows/labeler-untriaged.yml
@@ -9,5 +9,6 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions-ecosystem/action-add-labels@v1
+      if: join(github.event.issue.labels) == ''
      with:
        labels: "Status: Untriaged"