Skip to content

Actions: discordia-space/CEV-Eris

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
186 workflow runs
186 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

convert assembly-related UIs to TGUI (#8342) Check for merge conflicts #1449: Commit d624f0e pushed by hyperioo
October 20, 2023 17:02 1m 16s master
master
October 20, 2023 17:02 1m 16s
add vscode configuration for prettier (#8341) Check for merge conflicts #1448: Commit 0ba0462 pushed by hyperioo
October 20, 2023 16:58 54s master
master
October 20, 2023 16:58 54s
Loads of Sprite Improvements (#8333) Check for merge conflicts #1447: Commit e7ca418 pushed by hyperioo
October 13, 2023 17:26 56s master
master
October 13, 2023 17:26 56s
Mounted flashlight changes (#8335) Check for merge conflicts #1446: Commit bdedf90 pushed by hyperioo
October 6, 2023 14:37 1m 11s master
master
October 6, 2023 14:37 1m 11s
Revert "Quickequip hotfix (#8219)" (#8332) Check for merge conflicts #1445: Commit 348264c pushed by hyperioo
October 6, 2023 14:17 54s master
master
October 6, 2023 14:17 54s
Fix light effect being movable (#8336) Check for merge conflicts #1444: Commit 4d968ca pushed by hyperioo
October 6, 2023 14:15 50s master
master
October 6, 2023 14:15 50s
Update LibertyStyle HUD (#8337) Check for merge conflicts #1443: Commit 30bdd6c pushed by hyperioo
October 6, 2023 14:14 42s master
master
October 6, 2023 14:14 42s
Cruciforms get renamed on activation, not on ejection (#8334) Check for merge conflicts #1442: Commit b76498c pushed by hyperioo
October 6, 2023 14:13 1m 2s master
master
October 6, 2023 14:13 1m 2s
Fix accessories being added to pockets (#8331) Check for merge conflicts #1441: Commit ccdbcf9 pushed by hyperioo
October 6, 2023 14:11 1m 14s master
master
October 6, 2023 14:11 1m 14s
Fix spacesuits with attachements being unremovable (#8330) Check for merge conflicts #1440: Commit cb82ce0 pushed by hyperioo
October 6, 2023 14:10 1m 3s master
master
October 6, 2023 14:10 1m 3s
Fix calling parent proc for roachsign (#8329) Check for merge conflicts #1439: Commit d8bc585 pushed by hyperioo
October 6, 2023 14:08 1m 7s master
master
October 6, 2023 14:08 1m 7s