Skip to content

Actions: Foundation-19/Hail-Mary

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
19 workflow run results
19 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

various final day tweaks (#98) Check for merge conflicts #19: Commit 42efba8 pushed by Aurrain
April 19, 2024 20:25 38s master
master
April 19, 2024 20:25 38s
Family Heirloom Tweaks (#94) Check for merge conflicts #18: Commit cf29e97 pushed by Aurrain
April 19, 2024 19:15 39s master
master
April 19, 2024 19:15 39s
Weapon Tweaks (#93) Check for merge conflicts #17: Commit 2dac8b9 pushed by Aurrain
April 19, 2024 19:14 39s master
master
April 19, 2024 19:14 39s
Test fixes (#87) Check for merge conflicts #16: Commit 7d43aa1 pushed by Aurrain
April 19, 2024 19:13 36s master
master
April 19, 2024 19:13 36s
[WIP] Removes furry code and remains of anything genital related (#51) Check for merge conflicts #15: Commit 84bf9a4 pushed by Aurrain
April 19, 2024 00:59 28s master
master
April 19, 2024 00:59 28s
Tribal origin quirks now work (#89) Check for merge conflicts #14: Commit 56a9d55 pushed by Aurrain
April 17, 2024 22:23 39s master
master
April 17, 2024 22:23 39s
Ultradense - Mobs Only (#91) Check for merge conflicts #13: Commit 7675cb1 pushed by Aurrain
April 17, 2024 15:42 38s master
master
April 17, 2024 15:42 38s
Gate Fix: Brotherhood Gate (#90) Check for merge conflicts #12: Commit 72c41f8 pushed by Aurrain
April 16, 2024 22:46 38s master
master
April 16, 2024 22:46 38s
Dirt-Road Transitions (#88) Check for merge conflicts #11: Commit 5f9c51a pushed by Aurrain
April 16, 2024 21:20 37s master
master
April 16, 2024 21:20 37s
Map Addition: Legion Medical + IV now bugfree (#85) Check for merge conflicts #10: Commit c6e3cb6 pushed by Aurrain
April 15, 2024 22:44 36s master
master
April 15, 2024 22:44 36s
Total unarmed balancing + quirk changes (#86) Check for merge conflicts #9: Commit 1509944 pushed by Aurrain
April 15, 2024 22:42 38s master
master
April 15, 2024 22:42 38s
IC Filter Plural Match Check for merge conflicts #8: Commit 20d2552 pushed by Aurrain
April 12, 2024 14:28 39s master
master
April 12, 2024 14:28 39s
loadouts (#43) Check for merge conflicts #7: Commit 57942be pushed by Aurrain
April 11, 2024 02:57 37s master
master
April 11, 2024 02:57 37s
Lizardpeople tongue fix Check for merge conflicts #6: Commit e6815ce pushed by Aurrain
April 7, 2024 23:11 25s master
master
April 7, 2024 23:11 25s
Fly tongue error fix Check for merge conflicts #5: Commit 87c6f93 pushed by Aurrain
April 7, 2024 23:10 46s master
master
April 7, 2024 23:10 46s
Anti Lickheal Update Check for merge conflicts #4: Commit 4a6e830 pushed by Aurrain
April 7, 2024 23:08 44s master
master
April 7, 2024 23:08 44s
Anti-lickheal Update Check for merge conflicts #3: Commit 9864776 pushed by Aurrain
April 7, 2024 23:05 44s master
master
April 7, 2024 23:05 44s
Removes Lick Healing & Special Tongues (not abductors just in case) (… Check for merge conflicts #2: Commit a2b00ca pushed by Aurrain
April 4, 2024 21:07 41s master
master
April 4, 2024 21:07 41s
more 515 fixes (#83) Check for merge conflicts #1: Commit 7a4c544 pushed by Aurrain
April 3, 2024 19:18 41s master
master
April 3, 2024 19:18 41s