diff options
| -rw-r--r-- | .github/workflows/label-merge-conflict.yml | 26 | ||||
| -rw-r--r-- | constants/Sacks.json | 40 |
2 files changed, 65 insertions, 1 deletions
diff --git a/.github/workflows/label-merge-conflict.yml b/.github/workflows/label-merge-conflict.yml new file mode 100644 index 0000000..16fbd88 --- /dev/null +++ b/.github/workflows/label-merge-conflict.yml @@ -0,0 +1,26 @@ +name: "Merge Conflict Label" +on: + # So that PRs touching the same files as the push are updated + push: + branches: [ main ] + # So that the `dirtyLabel` is removed if conflicts are resolve + # We recommend `pull_request_target` so that github secrets are available. + # In `pull_request` we wouldn't be able to change labels of fork PRs + pull_request_target: + types: [ opened, synchronize ] + +jobs: + conflicts: + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write + steps: + - name: Update PRs with conflict labels + uses: eps1lon/actions-label-merge-conflict@releases/2.x + with: + dirtyLabel: "Merge Conflicts" + #removeOnDirtyLabel: "PR: ready to ship" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "This pull request has conflicts with the base branch. Please resolve those so we can evaluate the pull request." + commentOnClean: "Conflicts have been resolved! 🎉 A maintainer will review the pull request shortly." diff --git a/constants/Sacks.json b/constants/Sacks.json index ea0019b..84f7866 100644 --- a/constants/Sacks.json +++ b/constants/Sacks.json @@ -226,6 +226,8 @@ "Enchanted Diamond Block", "Enchanted Lapis Lazuli", "Enchanted Lapis Block", + "Enchanted Hard Stone", + "Concentrated Stone", "Enchanted Emerald", "Enchanted Emerald Block", "Enchanted Redstone", @@ -399,6 +401,42 @@ "Silver Obfuscated 2", "Silver Obfuscated 3", "Wishing Compass", - "Ascension Rope" + "Ascension Rope", + "Dark Candy", + "Compost", + "Bigfoot's Lasso", + "Brown Mushroom", + "Chili Pepper", + "Dungeon Chest Key", + "Enchanted Block of Coal", + "Enchanted Cooked Fish", + "Enchanted Cooked Salmon", + "Enchanted Eye of Ender", + "Enchanted Hard Stone", + "Enchanted Hay Bale", + "Enchanted Ink Sac", + "Enchanted Rabbit Foot", + "Enchanted Rabbit Hide", + "Enchanted Raw Beef", + "Enchanted Red Mushroom Block", + "Enchanted Sulphur Cube", + "Enchanted Wet Sponge", + "Glacial Fragment", + "Gold Magmafish", + "Golden Carrot", + "Gusher", + "Ice", + "Ink Sac", + "Kismet Feather", + "Packed Ice", + "Rabbit Hide", + "Rabbit's Foot", + "Raw Beef", + "Red Mushroom", + "Silver Magmafish", + "Snow Block", + "Stone", + "Tightly-Tied Hay Bale", + "Walnut" ] } |