Skip to content

Actions: IntellectualSites/PlotSquared

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflicts.yaml
19 workflow run results
19 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix: disable sign-coloring when edit-sign flag is false Label conflicting PRs #96: Pull request #4252 synchronize by Tamikaschu
December 3, 2023 20:31 13s CuteCraft-Network:fix/sign-coloring
CuteCraft-Network:fix/sign-coloring
December 3, 2023 20:31 13s
Fix: disable sign-coloring when edit-sign flag is false Label conflicting PRs #95: Pull request #4252 synchronize by Tamikaschu
December 3, 2023 20:31 10s
December 3, 2023 20:31 10s
feat: add HasOwner PlotFilter filter Label conflicting PRs #94: Pull request #4259 synchronize by dordsor21
December 3, 2023 19:33 13s feat/v7/has-owner-plot-filter
feat/v7/has-owner-plot-filter
December 3, 2023 19:33 13s
feat: add HasOwner PlotFilter filter Label conflicting PRs #93: Pull request #4259 synchronize by dordsor21
December 3, 2023 19:33 10s
December 3, 2023 19:33 10s
change since to TODO Label conflicting PRs #92: Commit d50e071 pushed by dordsor21
December 3, 2023 19:32 11s feat/v7/has-owner-plot-filter
feat/v7/has-owner-plot-filter
December 3, 2023 19:32 11s
refactor: move leave event dispact to after logic Label conflicting PRs #91: Commit 3e889b4 pushed by dordsor21
December 3, 2023 16:16 8s refactor/v7/send-leave-event-after-logic
refactor/v7/send-leave-event-after-logic
December 3, 2023 16:16 8s
feat: add HasOwner PlotFilter filter Label conflicting PRs #90: Commit 443c60c pushed by dordsor21
December 3, 2023 16:13 10s feat/v7/has-owner-plot-filter
feat/v7/has-owner-plot-filter
December 3, 2023 16:13 10s
feat: add specific admin permissions for placing vehicles Label conflicting PRs #89: Commit 3dc4410 pushed by dordsor21
December 3, 2023 16:05 11s feat/v7/vehicle-placement-permissions
feat/v7/vehicle-placement-permissions
December 3, 2023 16:05 11s
feat: add projectile-change-block flag Label conflicting PRs #88: Pull request #4185 synchronize by dordsor21
December 3, 2023 14:25 12s feature/v7/projectile-change-block-flag
feature/v7/projectile-change-block-flag
December 3, 2023 14:25 12s
feat: add projectile-change-block flag Label conflicting PRs #87: Pull request #4185 synchronize by dordsor21
December 3, 2023 14:25 10s
December 3, 2023 14:25 10s
Allow use on road Label conflicting PRs #86: Commit 6915141 pushed by dordsor21
December 3, 2023 14:25 10s feature/v7/projectile-change-block-flag
feature/v7/projectile-change-block-flag
December 3, 2023 14:25 10s
feat: add projectile-change-block flag Label conflicting PRs #85: Pull request #4185 synchronize by dordsor21
December 3, 2023 14:22 11s feature/v7/projectile-change-block-flag
feature/v7/projectile-change-block-flag
December 3, 2023 14:22 11s
feat: add projectile-change-block flag Label conflicting PRs #84: Pull request #4185 synchronize by dordsor21
December 3, 2023 14:22 11s
December 3, 2023 14:22 11s
Merge branch 'main' into feature/v7/projectile-change-block-flag Label conflicting PRs #83: Commit 5ea6b41 pushed by dordsor21
December 3, 2023 14:22 17s feature/v7/projectile-change-block-flag
feature/v7/projectile-change-block-flag
December 3, 2023 14:22 17s
fix: allow pistons on merged plot road if detect-invalid-edge-pistons… Label conflicting PRs #82: Commit 4bfc982 pushed by dordsor21
December 3, 2023 14:18 14s fix/v7/merged-plot-pistons
fix/v7/merged-plot-pistons
December 3, 2023 14:18 14s
Fix: disable sign-coloring when edit-sign flag is false Label conflicting PRs #80: Pull request #4252 synchronize by Tamikaschu
December 3, 2023 10:49 11s
December 3, 2023 10:49 11s
Fix: disable sign-coloring when edit-sign flag is false Label conflicting PRs #79: Pull request #4252 synchronize by Tamikaschu
December 2, 2023 13:05 13s CuteCraft-Network:fix/sign-coloring
CuteCraft-Network:fix/sign-coloring
December 2, 2023 13:05 13s
Fix: disable sign-coloring when edit-sign flag is false Label conflicting PRs #78: Pull request #4252 synchronize by Tamikaschu
December 2, 2023 13:05 10s
December 2, 2023 13:05 10s
Build PRs on Java 17 and 21 Label conflicting PRs #77: Commit 7b67479 pushed by NotMyFault
December 2, 2023 09:51 12s jdk14-21
jdk14-21
December 2, 2023 09:51 12s