Skip to content

Actions: IntellectualSites/FastAsyncWorldEdit

Actions

Label conflicting PRs

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

feat: add config option for if the DOC should lock the file channel Label conflicting PRs #196: Commit eaf0403 pushed by dordsor21
December 17, 2023 11:57 10s feat/allow-configuring-doc-file-locking
feat/allow-configuring-doc-file-locking
December 17, 2023 11:57 10s
feat: add switch to allow removal of entities on paste Label conflicting PRs #195: Commit 73207c6 pushed by dordsor21
December 17, 2023 11:46 10s feat/entity-removal-on-paste
feat/entity-removal-on-paste
December 17, 2023 11:46 10s
chore: add a more informative error when parsing block properties Label conflicting PRs #194: Commit 95be66c pushed by dordsor21
December 17, 2023 11:12 10s chore/useful-property-parse-error
chore/useful-property-parse-error
December 17, 2023 11:12 10s
Update paper Label conflicting PRs #193: Commit 17abaeb pushed by NotMyFault
December 16, 2023 21:45 2m 10s main
main
December 16, 2023 21:45 2m 10s
Update github/codeql-action action to v3 (#2523) Label conflicting PRs #192: Commit 885df02 pushed by NotMyFault
December 16, 2023 21:42 13s main
main
December 16, 2023 21:42 13s
Update dependency org.checkerframework:checker-qual to v3.42.0 (#2521) Label conflicting PRs #191: Commit 0d35cfb pushed by NotMyFault
December 16, 2023 21:40 2m 14s main
main
December 16, 2023 21:40 2m 14s
Update plotsquared to v7.2.1 (#2520) Label conflicting PRs #190: Commit d4d7cb0 pushed by NotMyFault
December 16, 2023 21:40 4m 16s main
main
December 16, 2023 21:40 4m 16s
Update github/codeql-action action to v3 Label conflicting PRs #189: Commit 1bc8b59 pushed by renovate bot
December 16, 2023 21:30 9s renovate/github-codeql-action-3.x
renovate/github-codeql-action-3.x
December 16, 2023 21:30 9s
Update actions/upload-artifact action to v4 Label conflicting PRs #188: Commit d51e04a pushed by renovate bot
December 16, 2023 21:30 10s renovate/actions-upload-artifact-4.x
renovate/actions-upload-artifact-4.x
December 16, 2023 21:30 10s
Update dependency org.checkerframework:checker-qual to v3.42.0 Label conflicting PRs #187: Commit 0edae47 pushed by renovate bot
December 16, 2023 21:30 12s renovate/checkerqual
renovate/checkerqual
December 16, 2023 21:30 12s
Update plotsquared to v7.2.1 Label conflicting PRs #186: Commit 8aa011f pushed by renovate bot
December 16, 2023 21:30 11s renovate/plotsquared
renovate/plotsquared
December 16, 2023 21:30 11s
feat: improved entity operations Label conflicting PRs #185: Pull request #2356 synchronize by dordsor21
December 16, 2023 18:36 10s feat/improved-entity-operations
feat/improved-entity-operations
December 16, 2023 18:36 10s
feat: improved entity operations Label conflicting PRs #184: Pull request #2356 synchronize by dordsor21
December 16, 2023 18:36 12s
December 16, 2023 18:36 12s
Add changes to 1.20.4 adapters Label conflicting PRs #183: Commit 01b980a pushed by dordsor21
December 16, 2023 18:36 13s feat/improved-entity-operations
feat/improved-entity-operations
December 16, 2023 18:36 13s
feat: allow placement of minecraft gen features and structures Label conflicting PRs #182: Pull request #2364 synchronize by dordsor21
December 12, 2023 17:28 18s feat/feature-placement
feat/feature-placement
December 12, 2023 17:28 18s
feat: allow placement of minecraft gen features and structures Label conflicting PRs #181: Pull request #2364 synchronize by dordsor21
December 12, 2023 17:28 12s
December 12, 2023 17:28 12s
Update 1.20.3/4 adapters Label conflicting PRs #180: Commit 324dfa8 pushed by dordsor21
December 12, 2023 17:28 13s feat/feature-placement
feat/feature-placement
December 12, 2023 17:28 13s
feat: improved entity operations Label conflicting PRs #179: Pull request #2356 synchronize by dordsor21
December 12, 2023 17:08 27s feat/improved-entity-operations
feat/improved-entity-operations
December 12, 2023 17:08 27s
feat: improved entity operations Label conflicting PRs #178: Pull request #2356 synchronize by dordsor21
December 12, 2023 17:08 29s
December 12, 2023 17:08 29s
Merge branch 'main' into feat/improved-entity-operations Label conflicting PRs #177: Commit 874311f pushed by dordsor21
December 12, 2023 17:08 27s feat/improved-entity-operations
feat/improved-entity-operations
December 12, 2023 17:08 27s
Fix plot swap Label conflicting PRs #176: Pull request #2360 synchronize by dordsor21
December 12, 2023 17:08 28s fix/plot-swap
fix/plot-swap
December 12, 2023 17:08 28s
Merge branch 'main' into fix/plot-swap Label conflicting PRs #174: Commit ba7af4f pushed by dordsor21
December 12, 2023 17:08 23s fix/plot-swap
fix/plot-swap
December 12, 2023 17:08 23s
Fix plot swap Label conflicting PRs #175: Pull request #2360 synchronize by dordsor21
December 12, 2023 17:08 18s
December 12, 2023 17:08 18s
feat: allow placement of minecraft gen features and structures Label conflicting PRs #173: Pull request #2364 synchronize by dordsor21
December 12, 2023 17:08 18s feat/feature-placement
feat/feature-placement
December 12, 2023 17:08 18s
feat: allow placement of minecraft gen features and structures Label conflicting PRs #172: Pull request #2364 synchronize by dordsor21
December 12, 2023 17:08 17s
December 12, 2023 17:08 17s