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

Update dependency com.gradleup.shadow to v8.3.2 Label conflicting PRs #584: Commit 7c7f644 pushed by renovate bot
September 18, 2024 14:29 12s renovate/shadow
renovate/shadow
September 18, 2024 14:29 12s
Update fawe to v2.11.2 Label conflicting PRs #583: Commit 5e0957c pushed by renovate bot
September 15, 2024 18:25 2m 12s main
main
September 15, 2024 18:25 2m 12s
Update fawe to v2.11.2 Label conflicting PRs #582: Commit 627ea3e pushed by renovate bot
September 15, 2024 18:22 9s renovate/fawe
renovate/fawe
September 15, 2024 18:22 9s
Back to snapshot for development Label conflicting PRs #581: Commit c83306a pushed by NotMyFault
September 15, 2024 15:10 2m 16s main
main
September 15, 2024 15:10 2m 16s
Release 7.3.11 Label conflicting PRs #580: Commit 6f4c156 pushed by NotMyFault
September 15, 2024 15:10 9s 7.3.11
7.3.11
September 15, 2024 15:10 9s
Release 7.3.11 Label conflicting PRs #579: Commit 6f4c156 pushed by NotMyFault
September 15, 2024 15:10 2m 11s main
main
September 15, 2024 15:10 2m 11s
Read Adventure version from version catalogue Label conflicting PRs #578: Commit afb36d9 pushed by NotMyFault
September 15, 2024 12:22 2m 13s main
main
September 15, 2024 12:22 2m 13s
fix: load single plot areas on creation (#4490) Label conflicting PRs #577: Commit 001ae78 pushed by NotMyFault
September 14, 2024 08:46 2m 13s main
main
September 14, 2024 08:46 2m 13s
Update dependency com.gradleup.shadow to v8.3.1 Label conflicting PRs #576: Commit 5fc8e06 pushed by renovate bot
September 10, 2024 14:49 2m 15s main
main
September 10, 2024 14:49 2m 15s
Update dependency com.gradleup.shadow to v8.3.1 Label conflicting PRs #575: Commit ab08bda pushed by renovate bot
September 10, 2024 14:47 12s renovate/shadow
renovate/shadow
September 10, 2024 14:47 12s
Update dependency gradle to v8.10.1 Label conflicting PRs #574: Commit f9401dd pushed by renovate bot
September 9, 2024 10:50 2m 15s main
main
September 9, 2024 10:50 2m 15s
Update dependency gradle to v8.10.1 Label conflicting PRs #573: Commit 8051740 pushed by renovate bot
September 9, 2024 10:48 10s renovate/gradle-8.x
renovate/gradle-8.x
September 9, 2024 10:48 10s
Update dependency org.checkerframework:checker-qual to v3.47.0 Label conflicting PRs #572: Commit d1a48db pushed by renovate bot
September 4, 2024 19:07 2m 13s main
main
September 4, 2024 19:07 2m 13s
Update dependency org.checkerframework:checker-qual to v3.47.0 Label conflicting PRs #571: Commit eef7241 pushed by renovate bot
September 4, 2024 19:03 12s renovate/checkerqual
renovate/checkerqual
September 4, 2024 19:03 12s
fix: load single plot areas on creation Label conflicting PRs #570: Pull request #4490 synchronize by PierreSchwang
September 1, 2024 15:28 19s fix/4467
fix/4467
September 1, 2024 15:28 19s
fix: load single plot areas on creation Label conflicting PRs #569: Pull request #4490 synchronize by PierreSchwang
September 1, 2024 15:28 15s
September 1, 2024 15:28 15s
fix: don't allow overlapping plot areas Label conflicting PRs #568: Commit f3e16ac pushed by PierreSchwang
September 1, 2024 15:28 12s fix/4467
fix/4467
September 1, 2024 15:28 12s
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