Merge branch 'master' into feature/migrate-config

pajlads · Oct 11, 2024 · 175779c · 175779c
2 parents c2656b3 + 9718fff
commit 175779c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -35,7 +35,7 @@ jobs:
         run: ./gradlew shadowJar
 
       - name: Upload shadowJar
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: dinkplugin-shadow
           path: build/libs/dinkplugin-*-all.jar

diff --git a/.github/workflows/update-resources.yml b/.github/workflows/update-resources.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   update-resources:
+    if: ${{ github.repository_owner == 'pajlads' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/src/main/resources/npc_drops.json b/src/main/resources/npc_drops.json