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
11,365 workflow run results
11,365 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add: Lockboxes on Taipan are no longer created in protholates and exosuit fabricators Merge Conflict Detection #16469: Pull request #6049 synchronize by Ssheya
October 18, 2024 22:40 10s
October 18, 2024 22:40 10s
add: Lockboxes on Taipan are no longer created in protholates and exosuit fabricators Merge Conflict Detection #16468: Pull request #6049 opened by Ssheya
October 18, 2024 22:39 13s
October 18, 2024 22:39 13s
add: fake blindfold recipe Merge Conflict Detection #16467: Pull request #6047 synchronize by Ssheya
October 18, 2024 22:14 11s
October 18, 2024 22:14 11s
add: CE toolbet now can hold RCD and one more item Merge Conflict Detection #16466: Pull request #6048 opened by Ssheya
October 18, 2024 22:12 12s
October 18, 2024 22:12 12s
add: fake blindfold recipe Merge Conflict Detection #16465: Pull request #6047 opened by Ssheya
October 18, 2024 22:05 16s
October 18, 2024 22:05 16s
qol: centcom droppod adv camera console Merge Conflict Detection #16464: Pull request #6046 opened by Ssheya
October 18, 2024 21:42 11s
October 18, 2024 21:42 11s
add: fishing rod is now craftable in R&D Merge Conflict Detection #16463: Pull request #6045 synchronize by Ssheya
October 18, 2024 21:31 13s
October 18, 2024 21:31 13s
add: fishing rod is now craftable in R&D Merge Conflict Detection #16462: Pull request #6045 opened by Ssheya
October 18, 2024 21:30 13s
October 18, 2024 21:30 13s
add: blueshield sunglasses Merge Conflict Detection #16461: Pull request #6044 synchronize by Ssheya
October 18, 2024 21:20 10s
October 18, 2024 21:20 10s
add: blueshield sunglasses Merge Conflict Detection #16460: Pull request #6044 synchronize by Ssheya
October 18, 2024 21:19 10s
October 18, 2024 21:19 10s
add: blueshield sunglasses Merge Conflict Detection #16459: Pull request #6044 synchronize by Ssheya
October 18, 2024 21:17 9s
October 18, 2024 21:17 9s
add: blueshield sunglasses Merge Conflict Detection #16458: Pull request #6044 synchronize by Ssheya
October 18, 2024 21:09 14s
October 18, 2024 21:09 14s
add: blueshield sunglasses Merge Conflict Detection #16457: Pull request #6044 opened by Ssheya
October 18, 2024 21:07 12s
October 18, 2024 21:07 12s
add: suppressor for sp91 and wt550 (#5960) Merge Conflict Detection #16456: Commit 6270856 pushed by Bizzonium
October 18, 2024 18:22 2m 12s master220
master220
October 18, 2024 18:22 2m 12s
add: New map voting mode "Notriples" - next map can't be selected if … Merge Conflict Detection #16455: Commit c382513 pushed by Bizzonium
October 18, 2024 18:21 2m 16s master220
master220
October 18, 2024 18:21 2m 16s
add: suppressor for sp91 and wt550 Merge Conflict Detection #16454: Pull request #5960 synchronize by AlebriumUltra
October 18, 2024 18:13 11s
October 18, 2024 18:13 11s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16453: Pull request #5993 synchronize by Anorak2024
October 18, 2024 17:44 11s
October 18, 2024 17:44 11s
add: suppressor for sp91 and wt550 Merge Conflict Detection #16452: Pull request #5960 synchronize by AlebriumUltra
October 18, 2024 17:41 17s
October 18, 2024 17:41 17s
imageadd: Brass buckler and rustless sword have inhand sprites. Merge Conflict Detection #16451: Pull request #6031 synchronize by Mahimka42
October 18, 2024 14:58 23s
October 18, 2024 14:58 23s
Automatic changelog generation Merge Conflict Detection #16450: Commit 60a5de5 pushed by changelog-bot bot
October 18, 2024 14:07 2m 17s master220
master220
October 18, 2024 14:07 2m 17s
add: Sorting vending machines by files. New green shield spawn clothes for CentComm Merge Conflict Detection #16449: Pull request #6005 ready_for_review by Rafnik02
October 18, 2024 10:57 10s
October 18, 2024 10:57 10s
imageadd: Brass buckler and rustless sword have inhand sprites. Merge Conflict Detection #16448: Pull request #6031 synchronize by Mahimka42
October 18, 2024 09:50 12s
October 18, 2024 09:50 12s
bugfix: Nova Station #8 Patch (#6033) Merge Conflict Detection #16447: Commit be79469 pushed by Bizzonium
October 18, 2024 09:42 2m 19s master220
master220
October 18, 2024 09:42 2m 19s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16446: Pull request #5993 synchronize by Anorak2024
October 18, 2024 05:43 11s
October 18, 2024 05:43 11s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16445: Pull request #5993 synchronize by Anorak2024
October 18, 2024 05:42 2m 12s
October 18, 2024 05:42 2m 12s