Skip to content

Actions: IntellectualSites/PlotSquared

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

PostPlotClearEvent added Label conflicting PRs #139: Pull request #4268 synchronize by David-M-GitHub
December 19, 2023 02:50 9s
December 19, 2023 02:50 9s
PostPlotClearEvent added Label conflicting PRs #137: Pull request #4268 synchronize by David-M-GitHub
December 19, 2023 02:49 9s
December 19, 2023 02:49 9s
feat: allow for custom plot limit handling (#4261) Label conflicting PRs #136: Commit dbfc43e pushed by NotMyFault
December 18, 2023 20:07 2m 15s main
main
December 18, 2023 20:07 2m 15s
feat: Allow admin done permission to override requiring plot complexi… Label conflicting PRs #135: Commit c8b4a2f pushed by dordsor21
December 16, 2023 21:04 2m 22s main
main
December 16, 2023 21:04 2m 22s
Fix checkerframework javadoc URL Label conflicting PRs #134: Commit d851e27 pushed by NotMyFault
December 16, 2023 16:35 2m 12s main
main
December 16, 2023 16:35 2m 12s
feat: Allow admin done permission to override requiring plot complexity calculation Label conflicting PRs #132: Pull request #4267 synchronize by MrJoshuaT
December 14, 2023 23:52 9s
December 14, 2023 23:52 9s
feat: Allow admin done permission to override requiring plot complexity calculation Label conflicting PRs #133: Pull request #4267 synchronize by MrJoshuaT
December 14, 2023 23:52 16s BakeryBuilders:AllowAdminsToMarkAsDone
BakeryBuilders:AllowAdminsToMarkAsDone
December 14, 2023 23:52 16s
PostPlotClearEvent added Label conflicting PRs #131: Pull request #4268 synchronize by David-M-GitHub
December 14, 2023 22:21 15s David-M-GitHub:postplotclearevent
David-M-GitHub:postplotclearevent
December 14, 2023 22:21 15s
PostPlotClearEvent added Label conflicting PRs #130: Pull request #4268 synchronize by David-M-GitHub
December 14, 2023 22:21 14s
December 14, 2023 22:21 14s
PostPlotClearEvent added Label conflicting PRs #128: Pull request #4268 synchronize by David-M-GitHub
December 14, 2023 22:17 11s
December 14, 2023 22:17 11s
feat: configurable accounting for bedrock layer when setting components Label conflicting PRs #127: Pull request #4266 synchronize by dordsor21
December 12, 2023 14:45 14s feat/v7/plot-components-lower-height
feat/v7/plot-components-lower-height
December 12, 2023 14:45 14s
feat: configurable accounting for bedrock layer when setting components Label conflicting PRs #126: Pull request #4266 synchronize by dordsor21
December 12, 2023 14:45 11s
December 12, 2023 14:45 11s
Adjust for if plot bedrock is enabled Label conflicting PRs #125: Commit 8cd92c8 pushed by dordsor21
December 12, 2023 14:45 11s feat/v7/plot-components-lower-height
feat/v7/plot-components-lower-height
December 12, 2023 14:45 11s
feat: configurable accounting for bedrock layer when setting components Label conflicting PRs #124: Commit d85e3f4 pushed by dordsor21
December 12, 2023 14:42 17s feat/v7/plot-components-lower-height
feat/v7/plot-components-lower-height
December 12, 2023 14:42 17s
feat: add projectile-change-block flag (#4185) Label conflicting PRs #123: Commit 4a45729 pushed by dordsor21
December 12, 2023 13:53 2m 16s main
main
December 12, 2023 13:53 2m 16s
Update dependency org.checkerframework:checker-qual to v3.41.0 (#4265) Label conflicting PRs #122: Commit 7931c08 pushed by NotMyFault
December 9, 2023 09:26 2m 13s main
main
December 9, 2023 09:26 2m 13s
Update fawe to v2.8.3 (#4264) Label conflicting PRs #121: Commit 1456b29 pushed by NotMyFault
December 9, 2023 09:25 2m 10s main
main
December 9, 2023 09:25 2m 10s
Update dependency com.diffplug.spotless to v6.23.3 (#4263) Label conflicting PRs #120: Commit 761477b pushed by NotMyFault
December 9, 2023 09:25 2m 16s main
main
December 9, 2023 09:25 2m 16s
Update dependency org.checkerframework:checker-qual to v3.41.0 Label conflicting PRs #119: Commit 4bed93a pushed by renovate bot
December 9, 2023 09:21 13s renovate/checkerqual
renovate/checkerqual
December 9, 2023 09:21 13s
Update fawe to v2.8.3 Label conflicting PRs #118: Commit dfcccc6 pushed by renovate bot
December 9, 2023 09:21 9s renovate/fawe
renovate/fawe
December 9, 2023 09:21 9s
Update dependency com.diffplug.spotless to v6.23.3 Label conflicting PRs #117: Commit e35a379 pushed by renovate bot
December 9, 2023 09:21 10s renovate/spotless
renovate/spotless
December 9, 2023 09:21 10s
Back to snapshot for development Label conflicting PRs #116: Commit e61bcf9 pushed by NotMyFault
December 9, 2023 09:21 2m 12s main
main
December 9, 2023 09:21 2m 12s
Release 7.2.1 Label conflicting PRs #115: Commit 85bec71 pushed by NotMyFault
December 9, 2023 09:14 10s 7.2.1
7.2.1
December 9, 2023 09:14 10s
Release 7.2.1 Label conflicting PRs #114: Commit 85bec71 pushed by NotMyFault
December 9, 2023 09:14 2m 12s main
main
December 9, 2023 09:14 2m 12s
Release 7.2.1 Label conflicting PRs #113: Commit a099e28 pushed by NotMyFault
December 9, 2023 09:11 9s 7.2.1
7.2.1
December 9, 2023 09:11 9s