diff --git a/.github/workflows/automerge_dependabot.yml b/.github/workflows/automerge_dependabot.yml index fb0ceb69..5b406454 100644 --- 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/automerge-action@v0.16.3 + uses: pascalgn/automerge-action@v0.16.4 env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" MERGE_LABELS: "dependencies,java" diff --git a/pom.xml b/pom.xml index 1aea66b1..c6aaf539 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ com.google.errorprone error_prone_core - 2.31.0 + 2.33.0 diff --git a/resource-pack/assets/openinv/textures/item/crafting_output.png b/resource-pack/assets/openinv/textures/item/crafting_output.png index 7590bb45..a53a4142 100644 Binary files a/resource-pack/assets/openinv/textures/item/crafting_output.png and b/resource-pack/assets/openinv/textures/item/crafting_output.png differ diff --git a/resource-pack/assets/openinv/textures/item/not_a_slot.png b/resource-pack/assets/openinv/textures/item/not_a_slot.png index 300e19d2..1d78e569 100644 Binary files a/resource-pack/assets/openinv/textures/item/not_a_slot.png and b/resource-pack/assets/openinv/textures/item/not_a_slot.png differ