Skip to content

Actions: PMC-Unga-Marines/Unga-Marines

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
516 workflow runs
516 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Gun skins (#470) Check for merge conflicts #491: Commit cba5903 pushed by Helg2
October 18, 2024 07:44 42s master
master
October 18, 2024 07:44 42s
crusher (#564) Check for merge conflicts #490: Commit f2a7b63 pushed by Tatarla
October 18, 2024 03:21 40s master
master
October 18, 2024 03:21 40s
Adjusts acid blood splashes. (#544) Check for merge conflicts #489: Commit 4cbbc30 pushed by Tatarla
October 16, 2024 03:46 39s master
master
October 16, 2024 03:46 39s
delete royal bulwark (#536) Check for merge conflicts #488: Commit 204c0af pushed by Tatarla
October 15, 2024 11:27 43s master
master
October 15, 2024 11:27 43s
punch_act (#499) Check for merge conflicts #487: Commit 20cc3df pushed by Tatarla
October 13, 2024 16:19 44s master
master
October 13, 2024 16:19 44s
Доработки и нерф равагера (Инцидент №10738) (#322) Check for merge conflicts #486: Commit 0a01779 pushed by Tatarla
October 13, 2024 15:50 42s master
master
October 13, 2024 15:50 42s
Fixes preferences picture, removes tts from the code, a bit of cleani… Check for merge conflicts #485: Commit 04d022e pushed by Tatarla
October 13, 2024 12:02 1m 8s master
master
October 13, 2024 12:02 1m 8s
Fixes get_angle crash runtimes. (#534) Check for merge conflicts #484: Commit 74604a6 pushed by Tatarla
October 13, 2024 12:00 1m 33s master
master
October 13, 2024 12:00 1m 33s
Defund (#489) Check for merge conflicts #483: Commit 1f4a5b3 pushed by Tatarla
October 13, 2024 11:59 1m 25s master
master
October 13, 2024 11:59 1m 25s
hmm (#500) Check for merge conflicts #482: Commit c7c560e pushed by Tatarla
October 13, 2024 11:51 3m 7s master
master
October 13, 2024 11:51 3m 7s
Attempt to fix dupe with vend_delay and free essentials from loadout … Check for merge conflicts #481: Commit c9bdd68 pushed by Tatarla
October 13, 2024 11:50 3m 30s master
master
October 13, 2024 11:50 3m 30s
Kabooms (#466) Check for merge conflicts #480: Commit ef5f0c2 pushed by Tatarla
October 13, 2024 11:50 3m 53s master
master
October 13, 2024 11:50 3m 53s
Fixes x2 damage from crusher's charge, nerfs damage a bit, reorganiza… Check for merge conflicts #479: Commit b3e4f80 pushed by Tatarla
October 13, 2024 11:49 2m 6s master
master
October 13, 2024 11:49 2m 6s
gagaga emoji (#540) Check for merge conflicts #478: Commit 27934b7 pushed by Tatarla
October 13, 2024 11:48 2m 15s master
master
October 13, 2024 11:48 2m 15s
Makes xeno manifest actually useful. Unifies Marine Manifest and Xeno… Check for merge conflicts #477: Commit 1fbb733 pushed by Tatarla
October 13, 2024 11:47 37s master
master
October 13, 2024 11:47 37s
Deletes useless clothes bundles from clothe vendor. Adds a new unifor… Check for merge conflicts #476: Commit 1f8ac2a pushed by Tatarla
October 13, 2024 11:46 45s master
master
October 13, 2024 11:46 45s
Deletes old guns from weapon spawners, also deletes boxes with it's a… Check for merge conflicts #475: Commit 39e9fce pushed by Tatarla
October 13, 2024 11:46 49s master
master
October 13, 2024 11:46 49s
Update glasses.dm (#535) Check for merge conflicts #474: Commit f003ac1 pushed by Tatarla
October 13, 2024 11:46 30s master
master
October 13, 2024 11:46 30s
Sorts xeno caste icons into folders, refactors skins so it needs less… Check for merge conflicts #473: Commit 17bbcd0 pushed by Tatarla
October 13, 2024 11:46 47s master
master
October 13, 2024 11:46 47s
Ports 14749, 14717, 14732, 14742, 14768, 14777, 14760, 14790, 14791, … Check for merge conflicts #472: Commit c7fe20c pushed by Tatarla
October 11, 2024 09:52 38s master
master
October 11, 2024 09:52 38s
fix (#532) Check for merge conflicts #471: Commit 7327179 pushed by Helg2
October 10, 2024 19:39 38s master
master
October 10, 2024 19:39 38s
nerfacidblood (#531) Check for merge conflicts #470: Commit e1fc17c pushed by Helg2
October 10, 2024 18:27 40s master
master
October 10, 2024 18:27 40s
tyr and mimir buff (#530) Check for merge conflicts #469: Commit f83d159 pushed by Tatarla
October 10, 2024 17:43 6m 58s master
master
October 10, 2024 17:43 6m 58s
Revert "Раннер мега шиза баф! 21 урона -> 28. (#504)" (#506) Check for merge conflicts #468: Commit 459928f pushed by Tatarla
October 10, 2024 14:27 1m 29s master
master
October 10, 2024 14:27 1m 29s
Reorganize huds. (#483) Check for merge conflicts #467: Commit 18ff494 pushed by Tatarla
October 10, 2024 12:54 42s master
master
October 10, 2024 12:54 42s