Skip to content

Actions: IntellectualSites/PlotSquared

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix: load single plot areas on creation Label conflicting PRs #567: Commit d39a40f pushed by PierreSchwang
September 1, 2024 15:03 13s fix/4467
fix/4467
September 1, 2024 15:03 13s
Back to snapshot for development Label conflicting PRs #566: Commit db9b51a pushed by NotMyFault
August 31, 2024 09:31 2m 12s main
main
August 31, 2024 09:31 2m 12s
Release 7.3.10 Label conflicting PRs #565: Commit 511db0a pushed by NotMyFault
August 31, 2024 09:31 10s 7.3.10
7.3.10
August 31, 2024 09:31 10s
Release 7.3.10 Label conflicting PRs #564: Commit 511db0a pushed by NotMyFault
August 31, 2024 09:27 2m 20s main
main
August 31, 2024 09:27 2m 20s
Prevent vanished players from being in plot kick autocompletion (#4485) Label conflicting PRs #563: Commit e1ccda3 pushed by PierreSchwang
August 30, 2024 15:50 2m 13s main
main
August 30, 2024 15:50 2m 13s
fix: rename minecart EntityType enum constants (#4471) Label conflicting PRs #562: Commit a69cd60 pushed by PierreSchwang
August 25, 2024 20:12 2m 12s main
main
August 25, 2024 20:12 2m 12s
Update shadow Label conflicting PRs #561: Commit 5d4e6c5 pushed by NotMyFault
August 25, 2024 09:39 2m 13s main
main
August 25, 2024 09:39 2m 13s
Update MySQL properties URL Label conflicting PRs #560: Commit db05f14 pushed by NotMyFault
August 25, 2024 09:36 2m 14s main
main
August 25, 2024 09:36 2m 14s
fix: rename minecart EntityType enum constants Label conflicting PRs #559: Pull request #4471 synchronize by PierreSchwang
August 19, 2024 18:04 11s fix/killRoadMinecarts
fix/killRoadMinecarts
August 19, 2024 18:04 11s
chore: re-add older minecart entity type names Label conflicting PRs #558: Commit 6ad120b pushed by PierreSchwang
August 19, 2024 18:04 16s fix/killRoadMinecarts
fix/killRoadMinecarts
August 19, 2024 18:04 16s
fix: rename minecart EntityType enum constants Label conflicting PRs #557: Pull request #4471 synchronize by PierreSchwang
August 19, 2024 18:04 13s
August 19, 2024 18:04 13s
Update dependency org.bstats:bstats-bukkit to v3.0.3 Label conflicting PRs #556: Commit ee3dd00 pushed by renovate bot
August 19, 2024 08:35 2m 11s main
main
August 19, 2024 08:35 2m 11s
Update dependency org.bstats:bstats-bukkit to v3.0.3 Label conflicting PRs #555: Commit 2fdd132 pushed by renovate bot
August 19, 2024 08:33 14s renovate/bstats
renovate/bstats
August 19, 2024 08:33 14s
Update dependency xyz.jpenilla.run-paper to v2.3.1 Label conflicting PRs #554: Commit 346a482 pushed by renovate bot
August 18, 2024 22:38 2m 11s main
main
August 18, 2024 22:38 2m 11s
Update dependency xyz.jpenilla.run-paper to v2.3.1 Label conflicting PRs #553: Commit 64cc1aa pushed by renovate bot
August 18, 2024 22:36 11s renovate/runpaper
renovate/runpaper
August 18, 2024 22:36 11s
Reenable checkerframewowkr javadoc linking (#4483) Label conflicting PRs #552: Commit dfd80c4 pushed by PierreSchwang
August 17, 2024 23:11 2m 11s main
main
August 17, 2024 23:11 2m 11s
Reenable checkerframewowkr javadoc linking Label conflicting PRs #551: Commit ff89c61 pushed by NotMyFault
August 17, 2024 08:56 13s reenable-cf-javadocs
reenable-cf-javadocs
August 17, 2024 08:56 13s
Remove unused SNOW field which triggers legacy mode (#4472) Label conflicting PRs #550: Commit fad038e pushed by NotMyFault
August 15, 2024 05:37 2m 11s main
main
August 15, 2024 05:37 2m 11s
Fix use-flag on spigot servers (#4476) Label conflicting PRs #549: Commit 84b1af8 pushed by NotMyFault
August 15, 2024 05:36 2m 16s main
main
August 15, 2024 05:36 2m 16s
Update dependency gradle to v8.10 Label conflicting PRs #548: Commit 13c5a67 pushed by renovate bot
August 14, 2024 12:12 2m 14s main
main
August 14, 2024 12:12 2m 14s
Update junit5 monorepo Label conflicting PRs #547: Commit 8ae894d pushed by renovate bot
August 14, 2024 12:11 2m 11s main
main
August 14, 2024 12:11 2m 11s
Update junit5 monorepo Label conflicting PRs #546: Commit fe78f20 pushed by renovate bot
August 14, 2024 12:08 11s renovate/junit5-monorepo
renovate/junit5-monorepo
August 14, 2024 12:08 11s
Update dependency gradle to v8.10 Label conflicting PRs #545: Commit 987e5b3 pushed by renovate bot
August 14, 2024 12:08 16s renovate/gradle-8.x
renovate/gradle-8.x
August 14, 2024 12:08 16s
Prevent out of world claims (#4475) Label conflicting PRs #544: Commit bbb3736 pushed by NotMyFault
August 13, 2024 05:40 2m 12s main
main
August 13, 2024 05:40 2m 12s
Fix use-flag on spigot servers Label conflicting PRs #543: Pull request #4476 synchronize by PierreSchwang
August 12, 2024 19:47 14s
August 12, 2024 19:47 14s