Skip to content

Actions: ss220-space/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
459 workflow run results
459 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add:pulse demon,floor rework,tray adaptation(port) Merge Conflict Detection #5113: Pull request #3804 synchronize by ROdenFL
October 30, 2023 18:44 13s
October 30, 2023 18:44 13s
add:pulse demon,floor rework,tray adaptation(port) Merge Conflict Detection #5112: Pull request #3804 synchronize by ROdenFL
October 30, 2023 18:20 18s
October 30, 2023 18:20 18s
add:pulse demon,floor rework,tray adaptation(port) Merge Conflict Detection #5111: Pull request #3804 opened by ROdenFL
October 30, 2023 18:04 15s
October 30, 2023 18:04 15s
bugfix: lost coca sprites, grill abdwindow, wclass Merge Conflict Detection #5110: Pull request #3803 opened by ROdenFL
October 30, 2023 17:50 14s
October 30, 2023 17:50 14s
bugfix: fixed security & command sub-professions not being visible on crew monitor Merge Conflict Detection #5109: Pull request #3802 synchronize by Vladisvell
October 30, 2023 11:55 16s
October 30, 2023 11:55 16s
bugfix: fixed security & command sub-professions not being visible on crew monitor Merge Conflict Detection #5108: Pull request #3802 synchronize by Vladisvell
October 30, 2023 11:19 14s
October 30, 2023 11:19 14s
bugfix: fixed security & command sub-professions not being visible on crew monitor Merge Conflict Detection #5107: Pull request #3802 synchronize by Vladisvell
October 30, 2023 09:57 14s
October 30, 2023 09:57 14s
bugfix: fixed security & command sub-professions not being visible on crew monitor Merge Conflict Detection #5106: Pull request #3802 opened by Vladisvell
October 30, 2023 09:26 16s
October 30, 2023 09:26 16s
bugfix: Chessboard closes automatically when not nearby Merge Conflict Detection #5105: Pull request #3801 opened by Vladisvell
October 30, 2023 08:56 16s
October 30, 2023 08:56 16s
Suragi Jackets 1.1 Patch Merge Conflict Detection #5104: Pull request #3750 synchronize by XaycBC
October 30, 2023 08:27 18s
October 30, 2023 08:27 18s
bugfix: Ellis TTS voice is classified as male now Merge Conflict Detection #5103: Pull request #3800 opened by Vladisvell
October 30, 2023 08:02 17s
October 30, 2023 08:02 17s
add: Throwing knives martial art Merge Conflict Detection #5102: Pull request #3799 synchronize by LiquidPotroh
October 30, 2023 03:00 13s
October 30, 2023 03:00 13s
add: Throwing knives martial art Merge Conflict Detection #5101: Pull request #3799 opened by LiquidPotroh
October 30, 2023 02:12 15s
October 30, 2023 02:12 15s
tweak: bumped python dependency from 3.7.9 to 3.11.6 (#3797) Merge Conflict Detection #5100: Commit cc230ee pushed by Dimach
October 29, 2023 23:02 2m 17s master220
master220
October 29, 2023 23:02 2m 17s
bugfix: correct position of the light switch in rnd toxins Merge Conflict Detection #5099: Pull request #3798 opened by ArtemDerp
October 29, 2023 18:56 13s
October 29, 2023 18:56 13s
tweak: bumped python dependency from 3.7.9 to 3.11.6 Merge Conflict Detection #5098: Pull request #3797 opened by Vladisvell
October 29, 2023 18:54 15s
October 29, 2023 18:54 15s
Automatic changelog generation Merge Conflict Detection #5097: Commit 4665db1 pushed by changelog-bot bot
October 29, 2023 17:28 35s master220
master220
October 29, 2023 17:28 35s
bugfix: non-one-shot events now work correctly (#3789) Merge Conflict Detection #5096: Commit 7dd645d pushed by Dimach
October 29, 2023 17:26 2m 19s master220
master220
October 29, 2023 17:26 2m 19s
bugfix: Terror Breathing Fix (#3792) Merge Conflict Detection #5095: Commit 9466447 pushed by Dimach
October 29, 2023 17:25 2m 17s master220
master220
October 29, 2023 17:25 2m 17s
bugfix: slimes have no wings, heart max dmg is 60 (#3783) Merge Conflict Detection #5094: Commit de16860 pushed by Dimach
October 29, 2023 17:24 4m 20s master220
master220
October 29, 2023 17:24 4m 20s
bugfix: empty dna storage of headslugs (#3788) Merge Conflict Detection #5093: Commit 638ce09 pushed by Dimach
October 29, 2023 17:24 6m 27s master220
master220
October 29, 2023 17:24 6m 27s
bugfix: HUD Updates In Mind Transfer (#3786) Merge Conflict Detection #5092: Commit cae3792 pushed by Dimach
October 29, 2023 17:23 2m 14s master220
master220
October 29, 2023 17:23 2m 14s
bugfix: Throwing Fix (#3793) Merge Conflict Detection #5091: Commit b202cc2 pushed by Dimach
October 29, 2023 17:18 2m 18s master220
master220
October 29, 2023 17:18 2m 18s
bugfix: fixed resource exploit for ore redemption (#3796) Merge Conflict Detection #5090: Commit 33b6c30 pushed by Dimach
October 29, 2023 17:18 2m 20s master220
master220
October 29, 2023 17:18 2m 20s
bugfix: fixed resource exploit for ore redemption Merge Conflict Detection #5089: Pull request #3796 opened by Vladisvell
October 29, 2023 12:35 12s
October 29, 2023 12:35 12s