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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17751: Pull request #6168 synchronize by Antoonij
December 10, 2024 13:51 13s
December 10, 2024 13:51 13s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17750: Pull request #6168 synchronize by Antoonij
December 10, 2024 13:49 16s
December 10, 2024 13:49 16s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17749: Pull request #6168 synchronize by Antoonij
December 10, 2024 13:01 14s
December 10, 2024 13:01 14s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17748: Pull request #6168 synchronize by Antoonij
December 10, 2024 12:57 12s
December 10, 2024 12:57 12s
imageadd: NVG resprites Merge Conflict Detection #17747: Pull request #6219 synchronize by Etrnlmelancholy
December 10, 2024 12:33 10s
December 10, 2024 12:33 10s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17746: Pull request #6168 synchronize by Antoonij
December 10, 2024 12:27 13s
December 10, 2024 12:27 13s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17745: Pull request #6168 synchronize by Antoonij
December 10, 2024 12:21 11s
December 10, 2024 12:21 11s
add: Cosmetic Wryn Update: Resprite and Character Setup Update Merge Conflict Detection #17744: Pull request #6168 synchronize by Antoonij
December 10, 2024 12:17 14s
December 10, 2024 12:17 14s
imageadd: NVG resprites Merge Conflict Detection #17743: Pull request #6219 synchronize by Etrnlmelancholy
December 10, 2024 11:44 14s
December 10, 2024 11:44 14s
qol: tendril loot translation Merge Conflict Detection #17742: Pull request #6236 synchronize by Explosi00N
December 10, 2024 09:48 13s
December 10, 2024 09:48 13s
qol: tendril loot translation Merge Conflict Detection #17741: Pull request #6236 synchronize by Explosi00N
December 10, 2024 08:48 15s
December 10, 2024 08:48 15s
qol: tendril loot translation Merge Conflict Detection #17740: Pull request #6236 synchronize by Explosi00N
December 10, 2024 08:36 11s
December 10, 2024 08:36 11s
add: Adds an immunity to gravity damage for 5 seconds after exhaustion Merge Conflict Detection #17739: Pull request #6243 synchronize by Vladisvell
December 10, 2024 08:18 16s
December 10, 2024 08:18 16s
add: Adds an immunity to gravity damage for 5 seconds after exhaustion Merge Conflict Detection #17738: Pull request #6243 opened by Vladisvell
December 10, 2024 06:58 11s
December 10, 2024 06:58 11s
tweak: ma boy clown got some bipki Merge Conflict Detection #17737: Pull request #6242 synchronize by Etrnlmelancholy
December 10, 2024 05:05 15s
December 10, 2024 05:05 15s
tweak: ma boy clown got some bipki Merge Conflict Detection #17736: Pull request #6242 opened by Etrnlmelancholy
December 10, 2024 05:05 2m 14s
December 10, 2024 05:05 2m 14s
Adds config to disable shelleo logging Merge Conflict Detection #17735: Pull request #6241 opened by Vladisvell
December 9, 2024 18:13 13s
December 9, 2024 18:13 13s
add: Z level checking optimization (#6240) Merge Conflict Detection #17734: Commit 7e50571 pushed by Vladisvell
December 9, 2024 17:42 4m 16s master220
master220
December 9, 2024 17:42 4m 16s
add: Z level checking optimization Merge Conflict Detection #17733: Pull request #6240 opened by Vladisvell
December 9, 2024 17:32 12s
December 9, 2024 17:32 12s
add: Sound, new spite, translation for SM Merge Conflict Detection #17732: Pull request #6154 synchronize by Antoonij
December 9, 2024 17:19 10s
December 9, 2024 17:19 10s
add: Sound, new spite, translation for SM Merge Conflict Detection #17731: Pull request #6154 synchronize by Antoonij
December 9, 2024 17:10 12s
December 9, 2024 17:10 12s
Experimental perfomance fix for messages Merge Conflict Detection #17730: Pull request #6239 opened by Vladisvell
December 9, 2024 16:11 12s
December 9, 2024 16:11 12s
add: New Map - Segmentstation Merge Conflict Detection #17729: Pull request #5896 synchronize by Vladisvell
December 9, 2024 15:52 14s
December 9, 2024 15:52 14s
add: New Map - Segmentstation Merge Conflict Detection #17728: Pull request #5896 synchronize by Ravgolin
December 9, 2024 12:58 14s
December 9, 2024 12:58 14s
tweak: Rework suicide drill Merge Conflict Detection #17727: Pull request #6189 synchronize by Rafnik02
December 9, 2024 11:45 2m 13s
December 9, 2024 11:45 2m 13s