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
652 workflow run results
652 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Rework some attachments, give mg60 aim mode and add all attach AR (#597) Check for merge conflicts #577: Commit 13eeaa6 pushed by Tatarla
November 15, 2024 06:17 11m 7s master
master
November 15, 2024 06:17 11m 7s
Шляпы теперь зависят от одного и того же дефайна (#624) Check for merge conflicts #576: Commit d57b3c0 pushed by Tatarla
November 15, 2024 06:16 12m 28s master
master
November 15, 2024 06:16 12m 28s
Перевод разделов, возвращение лазерганов, перенос ряда пушек в раздел… Check for merge conflicts #575: Commit 20d03c3 pushed by Tatarla
November 15, 2024 06:15 5m 3s master
master
November 15, 2024 06:15 5m 3s
Update carrier.dm (#659) Check for merge conflicts #574: Commit c86913b pushed by Tatarla
November 15, 2024 06:09 3m 40s master
master
November 15, 2024 06:09 3m 40s
spitter primo little buff (#626) Check for merge conflicts #573: Commit b1e8d16 pushed by Tatarla
November 15, 2024 06:09 4m 1s master
master
November 15, 2024 06:09 4m 1s
Door kill (#614) Check for merge conflicts #572: Commit c3d58e2 pushed by Tatarla
November 15, 2024 06:04 11m 35s master
master
November 15, 2024 06:04 11m 35s
Rebalance xeno HP and armor (#594) Check for merge conflicts #571: Commit a531d21 pushed by Tatarla
November 14, 2024 05:56 4m 38s master
master
November 14, 2024 05:56 4m 38s
Rebalance ammo (#591) Check for merge conflicts #570: Commit f38638e pushed by Tatarla
November 14, 2024 05:56 5m 5s master
master
November 14, 2024 05:56 5m 5s
jetpackWithStagger (#645) Check for merge conflicts #569: Commit 0bad8bc pushed by Tatarla
November 14, 2024 05:53 42s master
master
November 14, 2024 05:53 42s
this should do it (#650) Check for merge conflicts #568: Commit 0a52985 pushed by Tatarla
November 14, 2024 03:37 44s master
master
November 14, 2024 03:37 44s
Cargo optimization! (#648) Check for merge conflicts #567: Commit 8d92fe0 pushed by Helg2
November 13, 2024 15:05 52s master
master
November 13, 2024 15:05 52s
proper layering for offhands (#637) Check for merge conflicts #566: Commit 509f29f pushed by Helg2
November 13, 2024 09:12 6m 53s master
master
November 13, 2024 09:12 6m 53s
Update projectile.dm (#640) Check for merge conflicts #565: Commit 0fa6e25 pushed by Helg2
November 13, 2024 09:12 6m 25s master
master
November 13, 2024 09:12 6m 25s
Update vending.dm (#639) Check for merge conflicts #564: Commit 77aaa32 pushed by Helg2
November 13, 2024 09:12 1m 25s master
master
November 13, 2024 09:12 1m 25s
Update ammo.dmi (#641) Check for merge conflicts #563: Commit 3cd0e41 pushed by Helg2
November 13, 2024 09:11 42s master
master
November 13, 2024 09:11 42s
Update flashlight.dm (#644) Check for merge conflicts #562: Commit 165411b pushed by Helg2
November 13, 2024 09:11 56s master
master
November 13, 2024 09:11 56s
Convert some spawn() to timers and asyncs. (#630) Check for merge conflicts #561: Commit 34035dd pushed by Helg2
November 11, 2024 07:21 37s master
master
November 11, 2024 07:21 37s
Tgas cargofix (#635) Check for merge conflicts #560: Commit cffba3b pushed by Helg2
November 9, 2024 22:13 3m 58s master
master
November 9, 2024 22:13 3m 58s
Update bigred.dm (#636) Check for merge conflicts #559: Commit 1323323 pushed by Helg2
November 9, 2024 21:54 34s master
master
November 9, 2024 21:54 34s
oops (#632) Check for merge conflicts #558: Commit c36b27e pushed by Helg2
November 8, 2024 17:18 2m 18s master
master
November 8, 2024 17:18 2m 18s
Нерф спрей-насадки (#623) Check for merge conflicts #557: Commit 80ce38f pushed by Tatarla
November 8, 2024 11:50 44s master
master
November 8, 2024 11:50 44s
Бафф подствольного гранатомета (#618) Check for merge conflicts #556: Commit 1035700 pushed by Tatarla
November 8, 2024 11:48 1m 16s master
master
November 8, 2024 11:48 1m 16s
Удаление кишки лавового озера на Магмуре (#625) Check for merge conflicts #555: Commit 2b047eb pushed by Helg2
November 7, 2024 12:47 53s master
master
November 7, 2024 12:47 53s
Tip of the Round, но по Русски (#494) Check for merge conflicts #554: Commit 520a4f5 pushed by Helg2
November 7, 2024 11:08 1m 38s master
master
November 7, 2024 11:08 1m 38s
Proper telecomms for crash. Repaths telecomms. (#628) Check for merge conflicts #553: Commit 73c6d8b pushed by Helg2
November 7, 2024 10:52 2m 26s master
master
November 7, 2024 10:52 2m 26s