Merge pull request #74 from CeladonSS13/beta-dev

Перенос обновлений с beta-dev на stable #3
CeladonSS13 · May 19, 2024 · a37d6e4 · a37d6e4
2 parents 6d7322a + fbe4fe8
commit a37d6e4
Show file tree

Hide file tree

Showing 13 changed files with 1,210 additions and 65,885 deletions.
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Check for merge conflict
-      uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e
+      uses: eps1lon/actions-label-merge-conflict@6d74047dcef155976a15e4a124dde2c7fe0c5522
       with:
         dirtyLabel: "Merge Conflict"
         repoToken: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Build and Publish Image to Registry
       env:
         BUILD_ARGS: -Icustom-items/inc.dm
-      uses: elgohr/Publish-Docker-Github-Action@e10960cb1a122ec21f80672099d68928892a106d
+      uses: elgohr/Publish-Docker-Github-Action@c20fc91411aa7d8a3961f40c27d12648d1812716
       with:
         name: ${{ secrets.IMAGE_NAME }}
         username: ${{ secrets.REG_USER }}

diff --git a/mod_celadon/__maps/maps/site53/site53-1.dmm b/mod_celadon/__maps/maps/site53/site53-1.dmm
diff --git a/mod_celadon/__maps/maps/site53/site53-2.dmm b/mod_celadon/__maps/maps/site53/site53-2.dmm