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
12,210 workflow run results
12,210 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add: Heart hud glasses Merge Conflict Detection #16598: Pull request #6072 synchronize by Daeberdir
October 26, 2024 13:31 9s
October 26, 2024 13:31 9s
add: Heart hud glasses Merge Conflict Detection #16597: Pull request #6072 synchronize by lolybomb
October 26, 2024 13:27 13s
October 26, 2024 13:27 13s
add: a lot of roboquest tweaks. Merge Conflict Detection #16596: Pull request #5961 synchronize by NightDawnFox
October 26, 2024 13:17 13s
October 26, 2024 13:17 13s
add: a lot of roboquest tweaks. Merge Conflict Detection #16595: Pull request #5961 synchronize by NightDawnFox
October 26, 2024 13:15 14s
October 26, 2024 13:15 14s
bugfix: Hardmode grenades do not work on enemies with less than 80% HP Merge Conflict Detection #16594: Pull request #6080 opened by Vladisvell
October 26, 2024 13:12 15s
October 26, 2024 13:12 15s
tweak: sniper rounds now cost 5 tk instead of 10 (#6068) Merge Conflict Detection #16593: Commit b421070 pushed by Bizzonium
October 26, 2024 09:26 2m 12s master220
master220
October 26, 2024 09:26 2m 12s
tweak: 10mm HP slows down the target (#6063) Merge Conflict Detection #16592: Commit fb702b9 pushed by Bizzonium
October 26, 2024 09:25 2m 13s master220
master220
October 26, 2024 09:25 2m 13s
imageadd: New sterile mask sprite (#6051) Merge Conflict Detection #16591: Commit c8deef3 pushed by Bizzonium
October 26, 2024 09:24 2m 11s master220
master220
October 26, 2024 09:24 2m 11s
add: Spech bubble (#6043) Merge Conflict Detection #16590: Commit 5a92fa0 pushed by Bizzonium
October 26, 2024 09:21 2m 12s master220
master220
October 26, 2024 09:21 2m 12s
soundadd: New revolution sound (#6035) Merge Conflict Detection #16589: Commit ec83781 pushed by Bizzonium
October 26, 2024 09:18 2m 11s master220
master220
October 26, 2024 09:18 2m 11s
soundadd: New cult sonds (#6034) Merge Conflict Detection #16588: Commit b223280 pushed by Bizzonium
October 26, 2024 09:18 2m 14s master220
master220
October 26, 2024 09:18 2m 14s
imageadd: Brass buckler and rustless sword have inhand sprites. (#6031) Merge Conflict Detection #16587: Commit 2789b61 pushed by Bizzonium
October 26, 2024 09:17 2m 14s master220
master220
October 26, 2024 09:17 2m 14s
bugfix: Nova Station #10 Patch (#6079) Merge Conflict Detection #16586: Commit b8729b5 pushed by Bizzonium
October 26, 2024 09:11 2m 11s master220
master220
October 26, 2024 09:11 2m 11s
Fix: ATM on Multi-z maps (#6077) Merge Conflict Detection #16585: Commit c8c4df8 pushed by Bizzonium
October 26, 2024 09:11 2m 12s master220
master220
October 26, 2024 09:11 2m 12s
add: health insurance (#5921) Merge Conflict Detection #16584: Commit 29f373e pushed by Bizzonium
October 26, 2024 09:07 2m 11s master220
master220
October 26, 2024 09:07 2m 11s
bugfix: pAI bugfixes + localization (#5874) Merge Conflict Detection #16583: Commit fed3c45 pushed by Bizzonium
October 26, 2024 09:06 2m 14s master220
master220
October 26, 2024 09:06 2m 14s
add: Experimentor relics rework (#5683) Merge Conflict Detection #16582: Commit 233a9b5 pushed by Bizzonium
October 26, 2024 09:06 2m 14s master220
master220
October 26, 2024 09:06 2m 14s
bugfix: Nova Station #10 Patch Merge Conflict Detection #16581: Pull request #6079 synchronize by PiroMage
October 26, 2024 08:33 12s
October 26, 2024 08:33 12s
add: Lasergun & Riotshotgun flashlights. Merge Conflict Detection #16580: Pull request #6074 synchronize by lolybomb
October 26, 2024 07:05 9s
October 26, 2024 07:05 9s
add: smoke rework a.k.a. killing atmos Merge Conflict Detection #16579: Pull request #6075 synchronize by Anorak2024
October 26, 2024 07:04 9s
October 26, 2024 07:04 9s
add: smoke rework a.k.a. killing atmos Merge Conflict Detection #16578: Pull request #6075 synchronize by Anorak2024
October 26, 2024 06:58 10s
October 26, 2024 06:58 10s
bugfix: Nova Station #10 Patch Merge Conflict Detection #16577: Pull request #6079 opened by PiroMage
October 26, 2024 06:57 11s
October 26, 2024 06:57 11s
add: health insurance Merge Conflict Detection #16576: Pull request #5921 synchronize by Anorak2024
October 26, 2024 06:56 10s
October 26, 2024 06:56 10s
add: Heart hud glasses Merge Conflict Detection #16575: Pull request #6072 synchronize by lolybomb
October 26, 2024 06:52 14s
October 26, 2024 06:52 14s
add: smoke rework a.k.a. killing atmos Merge Conflict Detection #16574: Pull request #6075 synchronize by Anorak2024
October 26, 2024 06:51 14s
October 26, 2024 06:51 14s