Skip to content

Commit

Permalink
Merge branch 'master' into infinite-color-applicator
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master authored Sep 6, 2024
2 parents 645800b + 8e89aa4 commit 1ea93f0
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 1 deletion.
41 changes: 41 additions & 0 deletions .github/workflows/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Credit to TechLord22 for writting this for the GTCEu repo

# Manages labels on PRs before allowing merging
name: Pull Request Labels

on:
pull_request:
types:
- opened
- labeled
- unlabeled
- synchronize

# if a second commit is pushed quickly after the first, cancel the first one's build
concurrency:
group: pr-labels-${{ github.head_ref }}
cancel-in-progress: true

jobs:
Labels:
runs-on: ubuntu-latest

permissions:
pull-requests: read # needed to utilize required-labels

steps:
- name: Check for Merge-Blocking Labels # blocks merge if present
uses: mheap/github-action-required-labels@v5
with:
mode: exactly
count: 0
labels: 'ongoing freeze - do not merge'
exit_type: failure

- name: Check for Required Labels # require at least one of these labels
uses: mheap/github-action-required-labels@v5
with:
mode: minimum
count: 1
labels: 'Affects Balance, bug fix, refactor, enhancement, MuTE, new feature, refactor'
exit_type: failure
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public boolean onBlockActivated(final World world, final int x, final int y, fin

final TileEntity te = world.getTileEntity(x, y, z);
if (te instanceof TileEntityDecayablesChest) {
TileEntityGuiFactory.open(player, x, y, z);
TileEntityGuiFactory.INSTANCE.open(player, x, y, z);
return true;
}
return false;
Expand Down

0 comments on commit 1ea93f0

Please sign in to comment.