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

[Code bounty] Clicking a magazine to tac reload instead of drag (#157… Check for merge conflicts #16: Commit a49d2ab pushed by Tatarla
July 20, 2024 07:15 36s master
master
July 20, 2024 07:15 36s
Off-hand shooting (#16165) (#24) Check for merge conflicts #15: Commit 9a6c589 pushed by Tatarla
July 20, 2024 07:14 35s master
master
July 20, 2024 07:14 35s
Damage flag and file cleanup. (#23) Check for merge conflicts #14: Commit 26e9a0a pushed by Tatarla
July 19, 2024 04:56 15s master
master
July 19, 2024 04:56 15s
Xeno penetration (#22) Check for merge conflicts #13: Commit 075d336 pushed by Tatarla
July 19, 2024 04:55 17s master
master
July 19, 2024 04:55 17s
Return of the tur, change in the status of modules and armor, new typ… Check for merge conflicts #12: Commit 22a5010 pushed by Tatarla
July 18, 2024 06:20 36s master
master
July 18, 2024 06:20 36s
Deletes a bunch of unused atmos stuff and code. (#18) Check for merge conflicts #11: Commit cd13fa6 pushed by Tatarla
July 17, 2024 15:08 45s master
master
July 17, 2024 15:08 45s
Optimizes health huds. (#11) Check for merge conflicts #10: Commit 93327ea pushed by Tatarla
July 16, 2024 09:31 35s master
master
July 16, 2024 09:31 35s
PR TEMPLATE FIX Check for merge conflicts #9: Commit f6661da pushed by fe-ed
July 15, 2024 15:45 37s master
master
July 15, 2024 15:45 37s
fix (#15) Check for merge conflicts #8: Commit f7efb39 pushed by Tatarla
July 15, 2024 09:41 36s master
master
July 15, 2024 09:41 36s
Makes hunter mirages more convincing, motion detectors now ignore xen… Check for merge conflicts #7: Commit 5c0fc3f pushed by Tatarla
July 14, 2024 15:00 37s master
master
July 14, 2024 15:00 37s
Update fusion_engine.dm (#12) Check for merge conflicts #6: Commit c9b62d2 pushed by Tatarla
July 14, 2024 11:52 34s master
master
July 14, 2024 11:52 34s
Merge pull request #10 from Helg2/space Check for merge conflicts #5: Commit 89c49c9 pushed by Tatarla
July 14, 2024 11:38 38s master
master
July 14, 2024 11:38 38s
Merge pull request #7 from Helg2/nightfall Check for merge conflicts #4: Commit d81a5b9 pushed by homexp13
July 14, 2024 07:55 26s master
master
July 14, 2024 07:55 26s
Merge pull request #9 from Helg2/patch-1 Check for merge conflicts #3: Commit c1f0227 pushed by homexp13
July 14, 2024 07:55 44s master
master
July 14, 2024 07:55 44s
Merge pull request #5 from PMC-Unga-Marines/cleanup Check for merge conflicts #2: Commit 361aca6 pushed by Tatarla
July 13, 2024 15:38 59s master
master
July 13, 2024 15:38 59s
Module: Cleanup 2 (#2) Check for merge conflicts #1: Commit 54347bc pushed by Tatarla
July 12, 2024 09:38 26s master
master
July 12, 2024 09:38 26s
ProTip! You can narrow down the results and go further in time using created:<2024-07-12 or the other filters available.