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
1,286 workflow run results
1,286 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

bugfix: Wooden Sound For Few Closets Merge Conflict Detection #5849: Pull request #3987 opened by Gottfrei
December 2, 2023 23:22 13s
December 2, 2023 23:22 13s
refactor: Body Zones And Internal Organs Refactor Merge Conflict Detection #5848: Pull request #3960 synchronize by Gottfrei
December 2, 2023 22:58 10s
December 2, 2023 22:58 10s
refactor: Body Zones And Internal Organs Refactor Merge Conflict Detection #5847: Pull request #3960 synchronize by Gottfrei
December 2, 2023 22:58 11s
December 2, 2023 22:58 11s
refactor: Body Zones And Internal Organs Refactor Merge Conflict Detection #5846: Pull request #3960 synchronize by Gottfrei
December 2, 2023 22:46 13s
December 2, 2023 22:46 13s
refactor: Body Zones And Internal Organs Refactor Merge Conflict Detection #5845: Pull request #3960 synchronize by Gottfrei
December 2, 2023 22:46 10s
December 2, 2023 22:46 10s
qol: deal_overall_damage now can be configured to damage robotic limbs, Pentetic Acid no longer damages robotic limbs Merge Conflict Detection #5844: Pull request #3986 synchronize by Vladisvell
December 2, 2023 20:32 11s
December 2, 2023 20:32 11s
qol: deal_overall_damage now can be configured to damage robotic limbs, Pentetic Acid no longer damages robotic limbs Merge Conflict Detection #5843: Pull request #3986 opened by Vladisvell
December 2, 2023 20:24 14s
December 2, 2023 20:24 14s
qol: pAI with empty name field no longer can be saved Merge Conflict Detection #5842: Pull request #3985 opened by Vladisvell
December 2, 2023 19:05 13s
December 2, 2023 19:05 13s
balance: TC inflation Merge Conflict Detection #5841: Pull request #3984 synchronize by captainnelly
December 2, 2023 18:23 14s
December 2, 2023 18:23 14s
balance: TC inflation Merge Conflict Detection #5840: Pull request #3984 opened by captainnelly
December 2, 2023 18:19 14s
December 2, 2023 18:19 14s
add: Central Command rework Merge Conflict Detection #5839: Pull request #3900 synchronize by ItsMeJaba
December 2, 2023 18:18 11s
December 2, 2023 18:18 11s
add: Central Command rework Merge Conflict Detection #5838: Pull request #3900 synchronize by ItsMeJaba
December 2, 2023 18:15 10s
December 2, 2023 18:15 10s
add: Central Command rework Merge Conflict Detection #5837: Pull request #3900 synchronize by ItsMeJaba
December 2, 2023 18:05 9s
December 2, 2023 18:05 9s
add: Central Command rework Merge Conflict Detection #5836: Pull request #3900 synchronize by ItsMeJaba
December 2, 2023 17:59 10s
December 2, 2023 17:59 10s
refactor: Body Zones And Internal Organs Refactor Merge Conflict Detection #5835: Pull request #3960 synchronize by Gottfrei
December 2, 2023 17:37 13s
December 2, 2023 17:37 13s
add: Central Command rework Merge Conflict Detection #5834: Pull request #3900 synchronize by ItsMeJaba
December 2, 2023 17:27 11s
December 2, 2023 17:27 11s
refactor/add: Point Rework Merge Conflict Detection #5833: Pull request #3962 synchronize by Gottfrei
December 2, 2023 17:17 9s
December 2, 2023 17:17 9s
refactor/add: Point Rework Merge Conflict Detection #5832: Pull request #3962 synchronize by Gottfrei
December 2, 2023 17:16 10s
December 2, 2023 17:16 10s
refactor/add: Point Rework Merge Conflict Detection #5831: Pull request #3962 synchronize by Gottfrei
December 2, 2023 17:14 15s
December 2, 2023 17:14 15s
tweak: Reduced frequency of cold Merge Conflict Detection #5830: Pull request #3983 opened by LiquidPotroh
December 2, 2023 15:19 11s
December 2, 2023 15:19 11s
Automatic changelog generation Merge Conflict Detection #5829: Commit 260b9a9 pushed by changelog-bot bot
December 2, 2023 14:47 2m 17s master220
master220
December 2, 2023 14:47 2m 17s
bugfix: strange reagent reviving. (#3977) Merge Conflict Detection #5828: Commit 61259f2 pushed by Dimach
December 2, 2023 14:46 2m 15s master220
master220
December 2, 2023 14:46 2m 15s
bugfix: DNA injectors don't loose their sprite. (#3981) Merge Conflict Detection #5827: Commit 0d7c06d pushed by Dimach
December 2, 2023 14:45 2m 16s master220
master220
December 2, 2023 14:45 2m 16s
tweak: spraycans in artvend (#3972) Merge Conflict Detection #5826: Commit b337705 pushed by Dimach
December 2, 2023 14:44 4m 15s master220
master220
December 2, 2023 14:44 4m 15s
bugfix: fix runtimes in handcufs and holodec area copy (#3980) Merge Conflict Detection #5825: Commit 313f153 pushed by Dimach
December 2, 2023 14:43 10s master220
master220
December 2, 2023 14:43 10s