Skip to content

Actions: ChaoticOnyx/OnyxBay

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-labeler.yml
3,698 workflow runs
3,698 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

maptweak(polar): small remap and improvments Check Merge Conflicts #5038: Commit b1a3977 pushed by igorsaux
October 28, 2024 15:05 2m 9s dev
dev
October 28, 2024 15:05 2m 9s
fix(genesis): correct zones, playable xenobiology and correct path names Check Merge Conflicts #5037: Commit 4c9d4f5 pushed by igorsaux
October 28, 2024 15:04 2m 10s dev
dev
October 28, 2024 15:04 2m 10s
maptweak(polar): small remap and improvments Check Merge Conflicts #5036: Pull request #12937 synchronize by Zert0X
October 28, 2024 15:02 11s
October 28, 2024 15:02 11s
maptweak(polar): small remap and improvments Check Merge Conflicts #5035: Pull request #12937 synchronize by Zert0X
October 28, 2024 15:00 18s
October 28, 2024 15:00 18s
maptweak(polar): small remap and improvments Check Merge Conflicts #5034: Pull request #12937 synchronize by Zert0X
October 28, 2024 14:59 14s
October 28, 2024 14:59 14s
maptweak(polar): small remap and improvments Check Merge Conflicts #5033: Pull request #12937 synchronize by Zert0X
October 28, 2024 14:55 15s
October 28, 2024 14:55 15s
maptweak(polar): small remap and improvments Check Merge Conflicts #5032: Pull request #12937 synchronize by Zert0X
October 28, 2024 14:54 14s
October 28, 2024 14:54 14s
maptweak(polar): small remap and improvments Check Merge Conflicts #5031: Pull request #12937 synchronize by Zert0X
October 28, 2024 14:53 12s
October 28, 2024 14:53 12s
maptweak(polar): small remap and improvments Check Merge Conflicts #5030: Pull request #12937 opened by Zert0X
October 28, 2024 14:37 14s
October 28, 2024 14:37 14s
fix(sprite): adding lost dir's for medals Check Merge Conflicts #5029: Pull request #12936 opened by i1yadobr
October 28, 2024 05:50 14s
October 28, 2024 05:50 14s
fix(genesis): the right merchant shuttle console and license Check Merge Conflicts #5028: Pull request #12931 opened by i1yadobr
October 27, 2024 11:59 14s
October 27, 2024 11:59 14s
fix(genesis): correct zones, playable xenobiology and correct path names Check Merge Conflicts #5027: Pull request #12930 opened by i1yadobr
October 26, 2024 18:48 12s
October 26, 2024 18:48 12s
update(changelog): 20.10.2024 Check Merge Conflicts #5026: Commit 220a6a1 pushed by igorsaux
October 20, 2024 17:31 2m 13s dev
dev
October 20, 2024 17:31 2m 13s
revert(sprites): return door1 and door0 to their places Check Merge Conflicts #5025: Commit 92eda2e pushed by igorsaux
October 20, 2024 17:28 2m 9s dev
dev
October 20, 2024 17:28 2m 9s
fix(sprite): incorrect item_state name of cowboy hat Check Merge Conflicts #5024: Commit f1490df pushed by igorsaux
October 20, 2024 17:27 2m 9s dev
dev
October 20, 2024 17:27 2m 9s
fix(voidsuit): wrong name streamlined medical voidhelmet Check Merge Conflicts #5023: Commit d89f106 pushed by igorsaux
October 20, 2024 17:26 2m 11s dev
dev
October 20, 2024 17:26 2m 11s
revert(sprites): return door1 and door0 to their places Check Merge Conflicts #5022: Pull request #12920 opened by i1yadobr
October 18, 2024 11:28 15s
October 18, 2024 11:28 15s
update(changelog): 16.10.2024 Check Merge Conflicts #5021: Commit 3d5c949 pushed by igorsaux
October 16, 2024 19:48 2m 10s dev
dev
October 16, 2024 19:48 2m 10s
fix(autolathe): added missing recipes Check Merge Conflicts #5020: Commit 94ce9f6 pushed by igorsaux
October 16, 2024 19:47 10s dev
dev
October 16, 2024 19:47 10s
fix(boxes): removed large tubes from light boxes Check Merge Conflicts #5019: Commit b5949ce pushed by igorsaux
October 16, 2024 19:46 2m 10s dev
dev
October 16, 2024 19:46 2m 10s
fix(exodus): old instruments placement Check Merge Conflicts #5018: Commit 971b9b4 pushed by igorsaux
October 16, 2024 19:46 4m 16s dev
dev
October 16, 2024 19:46 4m 16s
fix(sprites): returning lost and null sprites Check Merge Conflicts #5017: Commit b73d702 pushed by igorsaux
October 16, 2024 19:45 2m 10s dev
dev
October 16, 2024 19:45 2m 10s
tweaking poise once again, removing poise immunity from knockdowns Check Merge Conflicts #5016: Commit 4f67216 pushed by igorsaux
October 16, 2024 19:45 4m 11s dev
dev
October 16, 2024 19:45 4m 11s
fix(sprite): incorrect item_state name of cowboy hat Check Merge Conflicts #5015: Pull request #12910 opened by i1yadobr
October 15, 2024 17:10 19s
October 15, 2024 17:10 19s
Tweaking poise once again, removing poise immunity from knockdowns Check Merge Conflicts #5014: Pull request #12909 opened by TobyThorne
October 15, 2024 10:51 15s
October 15, 2024 10:51 15s