Merge branch 'master' into dev/1_20_R2

# Conflicts: # pom.xml
Jikoo · Oct 26, 2024 · 2df4067 · 2df4067
2 parents 8f309f9 + d2ce3a5
commit 2df4067
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/automerge_dependabot.yml b/.github/workflows/automerge_dependabot.yml
@@ -47,7 +47,7 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           pull-request-number: "${{ env.PR_NUMBER }}"
       - name: Merge
-        uses: pascalgn/[email protected].3
+        uses: pascalgn/[email protected].4
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: "dependencies,java"

diff --git a/pom.xml b/pom.xml
@@ -153,7 +153,7 @@
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.31.0</version>
+                <version>2.33.0</version>
               </path>
             </annotationProcessorPaths>
             <compilerArgs>

diff --git a/resource-pack/assets/openinv/textures/item/crafting_output.png b/resource-pack/assets/openinv/textures/item/crafting_output.png
diff --git a/resource-pack/assets/openinv/textures/item/not_a_slot.png b/resource-pack/assets/openinv/textures/item/not_a_slot.png