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

# Conflicts: # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/train.yml
2024-06-21 18:30:31 +03:00
parent e2f97ece50 f041f58a6d
commit 3a910a7f7f
443 changed files with 8337 additions and 2540 deletions
--- a/.github/workflows/rsi-diff.yml
+++ b/.github/workflows/rsi-diff.yml
@@ -15,9 +15,12 @@ jobs:

      - name: Get changed files
        id: files
-        uses: Ana06/get-changed-files@v1.2
+        uses: Ana06/get-changed-files@v2.3.0
        with:
          format: 'space-delimited'
+          filter: | 
+            **.rsi
+            **.png

      - name: Diff changed RSIs
        id: diff