Skip to content

Actions: IntellectualSites/PlotSquared

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflicts.yaml
685 workflow runs
685 workflow runs

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 #104: Pull request #4252 synchronize by Tamikaschu
December 6, 2023 16:48 11s
December 6, 2023 16:48 11s
feat: allow for custom plot limit handling Label conflicting PRs #103: Pull request #4261 synchronize by PierreSchwang
December 4, 2023 18:59 11s feat/plotLimitApi
feat/plotLimitApi
December 4, 2023 18:59 11s
feat: allow for custom plot limit handling Label conflicting PRs #102: Pull request #4261 synchronize by PierreSchwang
December 4, 2023 18:59 10s
December 4, 2023 18:59 10s
chore: use fluent setter Label conflicting PRs #101: Commit fb3da2f pushed by PierreSchwang
December 4, 2023 18:59 12s feat/plotLimitApi
feat/plotLimitApi
December 4, 2023 18:59 12s
feat: allow for custom plot limit handling Label conflicting PRs #100: Pull request #4261 synchronize by PierreSchwang
December 4, 2023 18:32 16s feat/plotLimitApi
feat/plotLimitApi
December 4, 2023 18:32 16s
feat: allow for custom plot limit handling Label conflicting PRs #99: Pull request #4261 synchronize by PierreSchwang
December 4, 2023 18:32 13s
December 4, 2023 18:32 13s
feat: allow for custom plot limit handling Label conflicting PRs #98: Commit a0ee0ca pushed by PierreSchwang
December 4, 2023 18:32 15s feat/plotLimitApi
feat/plotLimitApi
December 4, 2023 18:32 15s
feat: allow for custom plot limit handling Label conflicting PRs #97: Commit c0b1179 pushed by PierreSchwang
December 4, 2023 17:49 10s feat/plotLimitApi
feat/plotLimitApi
December 4, 2023 17:49 10s
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
ProTip! You can narrow down the results and go further in time using created:<2023-12-02 or the other filters available.