Skip to content

Actions: IntellectualSites/FastAsyncWorldEdit

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Reuse generateTree code across versions (#2482) Label conflicting PRs #71: Commit c0a2eef pushed by dordsor21
November 21, 2023 17:26 2m 17s main
main
November 21, 2023 17:26 2m 17s
Use spigot library feature for ZSTD Label conflicting PRs #70: Commit 623e14a pushed by SirYwell
November 21, 2023 16:00 14s chore/zstd-spigot-library
chore/zstd-spigot-library
November 21, 2023 16:00 14s
feat: reimplement anvil feature Label conflicting PRs #69: Pull request #2404 synchronize by dordsor21
November 18, 2023 15:09 10s feature/anvil
feature/anvil
November 18, 2023 15:09 10s
feat: reimplement anvil feature Label conflicting PRs #68: Pull request #2404 synchronize by dordsor21
November 18, 2023 15:09 16s
November 18, 2023 15:09 16s
fixes after merge Label conflicting PRs #67: Commit f04e090 pushed by dordsor21
November 18, 2023 15:09 12s feature/anvil
feature/anvil
November 18, 2023 15:09 12s
feat: improved entity operations Label conflicting PRs #66: Pull request #2356 synchronize by dordsor21
November 18, 2023 15:07 21s feat/improved-entity-operations
feat/improved-entity-operations
November 18, 2023 15:07 21s
feat: improved entity operations Label conflicting PRs #65: Pull request #2356 synchronize by dordsor21
November 18, 2023 15:07 14s
November 18, 2023 15:07 14s
fixes after merge Label conflicting PRs #64: Commit ea6b43e pushed by dordsor21
November 18, 2023 15:07 13s feat/improved-entity-operations
feat/improved-entity-operations
November 18, 2023 15:07 13s
feat: more informative BoundedHeightMask error message Label conflicting PRs #63: Commit a64d24c pushed by dordsor21
November 18, 2023 15:05 2m 17s main
main
November 18, 2023 15:05 2m 17s
feat: reimplement anvil feature Label conflicting PRs #62: Pull request #2404 synchronize by dordsor21
November 18, 2023 14:50 12s feature/anvil
feature/anvil
November 18, 2023 14:50 12s
feat: reimplement anvil feature Label conflicting PRs #61: Pull request #2404 synchronize by dordsor21
November 18, 2023 14:50 10s
November 18, 2023 14:50 10s
Merge branch 'v3' into feature/anvil Label conflicting PRs #60: Commit 32c9a80 pushed by dordsor21
November 18, 2023 14:50 14s feature/anvil
feature/anvil
November 18, 2023 14:50 14s
feat: improved entity operations Label conflicting PRs #59: Pull request #2356 synchronize by dordsor21
November 18, 2023 14:48 13s feat/improved-entity-operations
feat/improved-entity-operations
November 18, 2023 14:48 13s
feat: improved entity operations Label conflicting PRs #58: Pull request #2356 synchronize by dordsor21
November 18, 2023 14:48 11s
November 18, 2023 14:48 11s
Merge branch 'main' into feat/improved-entity-operations Label conflicting PRs #57: Commit 6faa13f pushed by dordsor21
November 18, 2023 14:48 13s feat/improved-entity-operations
feat/improved-entity-operations
November 18, 2023 14:48 13s
Use FastSchematicReader by default (#2478) Label conflicting PRs #56: Commit 1a7f555 pushed by dordsor21
November 18, 2023 14:48 2m 15s v3
v3
November 18, 2023 14:48 2m 15s
Use FastSchematicReader by default (#2478) Label conflicting PRs #55: Commit 1a7f555 pushed by dordsor21
November 18, 2023 14:11 2m 15s main
main
November 18, 2023 14:11 2m 15s
Only unlock if previously locked (#2489) Label conflicting PRs #54: Commit 46dd71e pushed by dordsor21
November 8, 2023 20:39 2m 12s main
main
November 8, 2023 20:39 2m 12s
Only unlock if previously locked Label conflicting PRs #53: Commit e3aec55 pushed by SirYwell
November 5, 2023 14:42 11s fix/too-much-unlocking
fix/too-much-unlocking
November 5, 2023 14:42 11s
Back to snapshot for development Label conflicting PRs #52: Commit 1996a38 pushed by NotMyFault
November 3, 2023 14:40 2m 15s main
main
November 3, 2023 14:40 2m 15s
Release 2.8.2 Label conflicting PRs #51: Commit e8754bf pushed by NotMyFault
November 3, 2023 14:17 2m 13s main
main
November 3, 2023 14:17 2m 13s
Release 2.8.2 Label conflicting PRs #50: Commit 38fc4cf pushed by NotMyFault
November 3, 2023 14:13 14s 2.8.2
2.8.2
November 3, 2023 14:13 14s
Release 2.8.2 Label conflicting PRs #49: Commit 38fc4cf pushed by NotMyFault
November 3, 2023 14:07 2m 17s main
main
November 3, 2023 14:07 2m 17s
initial work on reworked regeneration logic Label conflicting PRs #48: Commit 8f3f0fa pushed by PierreSchwang
November 2, 2023 12:45 18s feat/regeneration
feat/regeneration
November 2, 2023 12:45 18s
Reuse generateTree code across versions Label conflicting PRs #47: Commit 3192e6c pushed by SirYwell
November 2, 2023 09:02 16s refactor/deduplicate-generateTree
refactor/deduplicate-generateTree
November 2, 2023 09:02 16s