Skip to content

Actions: ChaoticOnyx/OnyxBay

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix(fueltank): empty tank can no longer be blown up Check Merge Conflicts #4888: Pull request #12838 synchronize by i1yadobr
September 23, 2024 14:03 16s
September 23, 2024 14:03 16s
fix(fueltank): empty tank can no longer be blown up Check Merge Conflicts #4887: Pull request #12838 synchronize by i1yadobr
September 23, 2024 14:02 13s
September 23, 2024 14:02 13s
Eclipse Armoury and maintence fixes & Pathos blastdoor's Check Merge Conflicts #4886: Pull request #12839 opened by FelixArzt
September 23, 2024 13:53 11s
September 23, 2024 13:53 11s
fix(fueltank): empty tank can no longer be blown up Check Merge Conflicts #4885: Pull request #12838 opened by i1yadobr
September 23, 2024 12:29 14s
September 23, 2024 12:29 14s
update(changelog): 23.9.2024 Check Merge Conflicts #4884: Commit d79ee31 pushed by igorsaux
September 23, 2024 12:03 2m 18s dev
dev
September 23, 2024 12:03 2m 18s
tweak(recharger): wall chargers accept magazines from lawgiver Check Merge Conflicts #4883: Commit 563dded pushed by igorsaux
September 23, 2024 12:00 2m 13s dev
dev
September 23, 2024 12:00 2m 13s
fix(sprite): lost compact shotgun sprites Check Merge Conflicts #4882: Commit 4cd8869 pushed by igorsaux
September 23, 2024 11:59 2m 14s dev
dev
September 23, 2024 11:59 2m 14s
fix(gun): ion pistol sprite in hand, again Check Merge Conflicts #4881: Commit 27f3971 pushed by igorsaux
September 23, 2024 11:59 2m 13s dev
dev
September 23, 2024 11:59 2m 13s
Add restricted roles for assassinate contract, add contracts number l… Check Merge Conflicts #4880: Commit bfd19a9 pushed by igorsaux
September 23, 2024 11:59 2m 12s dev
dev
September 23, 2024 11:59 2m 12s
tweak(recharger): wall chargers accept magazines from lawgiver Check Merge Conflicts #4879: Pull request #12836 opened by i1yadobr
September 23, 2024 05:27 11s
September 23, 2024 05:27 11s
fix(config): default events_preset value Check Merge Conflicts #4878: Commit cbb4bfa pushed by igorsaux
September 22, 2024 20:19 2m 14s dev
dev
September 22, 2024 20:19 2m 14s
Add restricted roles for assassinate contract, add contracts number limit Check Merge Conflicts #4877: Pull request #12750 synchronize by Animusin
September 22, 2024 19:10 11s
September 22, 2024 19:10 11s
Add restricted roles for assassinate contract, add contracts number limit Check Merge Conflicts #4876: Pull request #12750 synchronize by Animusin
September 22, 2024 19:09 14s
September 22, 2024 19:09 14s
fix(sprite): lost compact shotgun sprites Check Merge Conflicts #4875: Pull request #12832 synchronize by i1yadobr
September 22, 2024 12:15 9s
September 22, 2024 12:15 9s
update(changelog): 22.9.2024 Check Merge Conflicts #4874: Commit 601095e pushed by igorsaux
September 22, 2024 12:09 2m 10s dev
dev
September 22, 2024 12:09 2m 10s
tweak(armor): adding sprites in the hand to a lot of armor Check Merge Conflicts #4873: Commit e6b0a50 pushed by igorsaux
September 22, 2024 12:06 2m 11s dev
dev
September 22, 2024 12:06 2m 11s
tweak(gun): fix acceleration pistol sprite & sprites in hands update Check Merge Conflicts #4872: Commit 3b2ea03 pushed by igorsaux
September 22, 2024 12:05 2m 13s dev
dev
September 22, 2024 12:05 2m 13s
fix(gun): ion pistol sprite in hand, again Check Merge Conflicts #4871: Pull request #12833 opened by i1yadobr
September 22, 2024 11:49 13s
September 22, 2024 11:49 13s
fix(sprite): lost compact shotgun sprites Check Merge Conflicts #4870: Pull request #12832 synchronize by i1yadobr
September 22, 2024 11:35 11s
September 22, 2024 11:35 11s
fix(sprite): lost compact shotgun sprites Check Merge Conflicts #4869: Pull request #12832 synchronize by i1yadobr
September 22, 2024 09:28 10s
September 22, 2024 09:28 10s
fix(sprite): lost compact shotgun sprites Check Merge Conflicts #4868: Pull request #12832 synchronize by i1yadobr
September 22, 2024 08:52 13s
September 22, 2024 08:52 13s
fix(sprite): lost compact shotgun sprites Check Merge Conflicts #4867: Pull request #12832 opened by i1yadobr
September 22, 2024 08:50 13s
September 22, 2024 08:50 13s
tweak(armor): adding sprites in the hand to a lot of armor Check Merge Conflicts #4866: Pull request #12826 synchronize by i1yadobr
September 22, 2024 04:55 13s
September 22, 2024 04:55 13s
tweak(armor): adding sprites in the hand to a lot of armor Check Merge Conflicts #4865: Pull request #12826 synchronize by i1yadobr
September 22, 2024 04:36 12s
September 22, 2024 04:36 12s
tweak(armor): adding sprites in the hand to a lot of armor Check Merge Conflicts #4864: Pull request #12826 synchronize by i1yadobr
September 22, 2024 04:26 12s
September 22, 2024 04:26 12s