Skip to content

Actions: IntellectualSites/PlotSquared

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

feature: use cloud v2 for commands Label conflicting PRs #267: Pull request #4283 synchronize by SirYwell
January 29, 2024 14:26 11s
January 29, 2024 14:26 11s
fix remaining change Label conflicting PRs #266: Commit e0c7c58 pushed by SirYwell
January 29, 2024 14:26 12s feature/cloud-v2
feature/cloud-v2
January 29, 2024 14:26 12s
feature: use cloud v2 for commands Label conflicting PRs #265: Pull request #4283 synchronize by SirYwell
January 29, 2024 14:21 12s feature/cloud-v2
feature/cloud-v2
January 29, 2024 14:21 12s
feature: use cloud v2 for commands Label conflicting PRs #264: Pull request #4283 synchronize by SirYwell
January 29, 2024 14:21 15s
January 29, 2024 14:21 15s
update cloud Label conflicting PRs #263: Commit a659832 pushed by SirYwell
January 29, 2024 14:21 18s feature/cloud-v2
feature/cloud-v2
January 29, 2024 14:21 18s
chore: Entity#getEntitySpawnReason compatibility for spigot Label conflicting PRs #262: Commit d758f50 pushed by PierreSchwang
January 27, 2024 19:18 9s chore/spigotCompat
chore/spigotCompat
January 27, 2024 19:18 9s
Back to snapshot for development Label conflicting PRs #261: Commit 966c878 pushed by NotMyFault
January 22, 2024 19:37 2m 12s main
main
January 22, 2024 19:37 2m 12s
Release 7.3.2 Label conflicting PRs #260: Commit 5021f5b pushed by NotMyFault
January 22, 2024 19:37 11s 7.3.2
7.3.2
January 22, 2024 19:37 11s
Release 7.3.2 Label conflicting PRs #259: Commit 5021f5b pushed by NotMyFault
January 22, 2024 19:32 2m 12s main
main
January 22, 2024 19:32 2m 12s
PostPlotClearEvent added (#4268) Label conflicting PRs #258: Commit 76ea9e0 pushed by NotMyFault
January 21, 2024 14:22 2m 12s main
main
January 21, 2024 14:22 2m 12s
Add events for plot buying (#4291) Label conflicting PRs #257: Commit 951f08b pushed by NotMyFault
January 21, 2024 14:21 2m 14s main
main
January 21, 2024 14:21 2m 14s
Fallback to areas QueueCoordinator when passing null (#4300) Label conflicting PRs #256: Commit ae941e6 pushed by NotMyFault
January 21, 2024 11:40 2m 12s main
main
January 21, 2024 11:40 2m 12s
Use MUSIC soundcategory for plot music flag (#4302) Label conflicting PRs #255: Commit 9566af5 pushed by NotMyFault
January 21, 2024 11:38 2m 13s main
main
January 21, 2024 11:38 2m 13s
Do not remove entitys with CUSTOM spawn-reason on CreatureSpawnEvent.… Label conflicting PRs #254: Commit fccc146 pushed by NotMyFault
January 21, 2024 11:33 2m 14s main
main
January 21, 2024 11:33 2m 14s
chore/fix: use MUSIC sound category for plot music Label conflicting PRs #253: Commit f94f7ac pushed by PierreSchwang
January 20, 2024 21:42 12s fix/plotMusic
fix/plotMusic
January 20, 2024 21:42 12s
chore: add annotations to suppress IDE warnings Label conflicting PRs #252: Commit c77037c pushed by PierreSchwang
January 20, 2024 19:36 10s fix/components
fix/components
January 20, 2024 19:36 10s
Fix home command reset (#4295) Label conflicting PRs #251: Commit a1d94af pushed by NotMyFault
January 19, 2024 23:34 2m 11s main
main
January 19, 2024 23:34 2m 11s
feature: use cloud v2 for commands Label conflicting PRs #250: Pull request #4283 synchronize by Citymonstret
January 15, 2024 06:54 13s feature/cloud-v2
feature/cloud-v2
January 15, 2024 06:54 13s
feature: use cloud v2 for commands Label conflicting PRs #249: Pull request #4283 synchronize by Citymonstret
January 15, 2024 06:54 10s
January 15, 2024 06:54 10s
use cloud snapshot Label conflicting PRs #248: Commit 2a0ad92 pushed by Citymonstret
January 15, 2024 06:54 9s feature/cloud-v2
feature/cloud-v2
January 15, 2024 06:54 9s
Add events for plot buying Label conflicting PRs #247: Pull request #4291 synchronize by PierreSchwang
January 14, 2024 13:42 14s feat/plotBuyEvents
feat/plotBuyEvents
January 14, 2024 13:42 14s
Add events for plot buying Label conflicting PRs #246: Pull request #4291 synchronize by PierreSchwang
January 14, 2024 13:42 12s
January 14, 2024 13:42 12s
feat: events for plot buy process Label conflicting PRs #245: Commit 811e0ec pushed by PierreSchwang
January 14, 2024 13:42 12s feat/plotBuyEvents
feat/plotBuyEvents
January 14, 2024 13:42 12s
feat: events for plot buy process Label conflicting PRs #244: Commit 0c9cfec pushed by PierreSchwang
January 14, 2024 13:37 14s feat/plotBuyEvents
feat/plotBuyEvents
January 14, 2024 13:37 14s
Update fawe to v2.8.4 (#4278) Label conflicting PRs #243: Commit 6371cd4 pushed by NotMyFault
January 13, 2024 16:04 2m 12s main
main
January 13, 2024 16:04 2m 12s
ProTip! You can narrow down the results and go further in time using created:<2024-01-13 or the other filters available.