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
717 workflow runs
717 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds beginner loadout vendor. (#634) Check for merge conflicts #592: Commit 76ab671 pushed by Helg2
November 24, 2024 17:00 36s master
master
November 24, 2024 17:00 36s
Нерф флаеров (#687) Check for merge conflicts #591: Commit b570b34 pushed by Tatarla
November 23, 2024 13:48 41s master
master
November 23, 2024 13:48 41s
change amout of marines for hijacking (#638) Check for merge conflicts #590: Commit a1f3705 pushed by Tatarla
November 22, 2024 06:55 8m 20s master
master
November 22, 2024 06:55 8m 20s
Add carrier changes (#633) Check for merge conflicts #589: Commit 7ec6a04 pushed by Tatarla
November 22, 2024 06:42 2m 10s master
master
November 22, 2024 06:42 2m 10s
Carrier buff (#658) Check for merge conflicts #588: Commit daa1b05 pushed by Tatarla
November 22, 2024 06:40 3m 43s master
master
November 22, 2024 06:40 3m 43s
T1 Crusher (Sent) (#680) Check for merge conflicts #587: Commit dca527a pushed by Tatarla
November 22, 2024 06:37 6m 7s master
master
November 22, 2024 06:37 6m 7s
swat mask ripping reaction (#683) Check for merge conflicts #586: Commit 3451088 pushed by Tatarla
November 22, 2024 06:35 41s master
master
November 22, 2024 06:35 41s
Replaces spawn() in explosion code to addtimer and INVOKE_ASYNC… Check for merge conflicts #585: Commit 94db9ae pushed by Helg2
November 21, 2024 19:27 33s master
master
November 21, 2024 19:27 33s
skills (#674) Check for merge conflicts #584: Commit 69535fd pushed by Helg2
November 21, 2024 19:27 50s master
master
November 21, 2024 19:27 50s
Merge join and ready button. (#656) Check for merge conflicts #583: Commit c521167 pushed by Helg2
November 19, 2024 22:55 2m 50s master
master
November 19, 2024 22:55 2m 50s
Handheld Charger and MRE for Cargo. (#651) Check for merge conflicts #582: Commit a412ef7 pushed by Helg2
November 18, 2024 12:53 37s master
master
November 18, 2024 12:53 37s
Фикс отсутствия паверфиста на дистрессе (#665) Check for merge conflicts #581: Commit 551e62f pushed by Tatarla
November 15, 2024 14:21 6m 40s master
master
November 15, 2024 14:21 6m 40s
Новый спрайт БТРа (#643) Check for merge conflicts #580: Commit 741284c pushed by Tatarla
November 15, 2024 11:57 7m 39s master
master
November 15, 2024 11:57 7m 39s
Изменение иконок приказов (#642) Check for merge conflicts #579: Commit 1236df6 pushed by Tatarla
November 15, 2024 11:56 37s master
master
November 15, 2024 11:56 37s
M344 belt and pistol belt buff (#660) Check for merge conflicts #578: Commit 6a4f76f pushed by Tatarla
November 15, 2024 06:17 11m 7s master
master
November 15, 2024 06:17 11m 7s
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