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
446 workflow run results
446 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

tweak: Vampire Tweaks and Fixes (#3660) Merge Conflict Detection #4788: Commit 4c076b5 pushed by Dimach
October 17, 2023 00:26 2m 17s master220
master220
October 17, 2023 00:26 2m 17s
tweak: BattlemageRecharges 3 FOR 1 (#3718) Merge Conflict Detection #4787: Commit 5e146da pushed by Dimach
October 17, 2023 00:23 2m 18s master220
master220
October 17, 2023 00:23 2m 18s
Fix: old Z2 emo shuttles (#3687) Merge Conflict Detection #4786: Commit 8359ab0 pushed by Dimach
October 17, 2023 00:19 3m 15s master220
master220
October 17, 2023 00:19 3m 15s
bugfix: fixed incorrect improvised shotgun rendering (#3724) Merge Conflict Detection #4785: Commit 9296f92 pushed by Dimach
October 17, 2023 00:15 6m 8s master220
master220
October 17, 2023 00:15 6m 8s
qol: fixing inventory cells for silicons (#3700) Merge Conflict Detection #4784: Commit 24a85b9 pushed by Dimach
October 17, 2023 00:14 7m 20s master220
master220
October 17, 2023 00:14 7m 20s
bugfix: separated objectives for different weapons. (#3708) Merge Conflict Detection #4783: Commit 54568cd pushed by Dimach
October 17, 2023 00:12 5m 44s master220
master220
October 17, 2023 00:12 5m 44s
bugfix: Now blob can't expand into transitional borders of the Z-leve… Merge Conflict Detection #4782: Commit 82a8354 pushed by Dimach
October 17, 2023 00:12 5m 31s master220
master220
October 17, 2023 00:12 5m 31s
tweak: BattlemageRecharges 3 FOR 1 Merge Conflict Detection #4781: Pull request #3718 synchronize by Dimach
October 17, 2023 00:11 5m 42s
October 17, 2023 00:11 5m 42s
add: mirror on beach biodome (#3706) Merge Conflict Detection #4780: Commit 8ef3f18 pushed by Dimach
October 17, 2023 00:09 7m 8s master220
master220
October 17, 2023 00:09 7m 8s
add:sexy mustache beards and hairstyles (#3682) Merge Conflict Detection #4779: Commit c2e4124 pushed by Dimach
October 17, 2023 00:09 9m 1s master220
master220
October 17, 2023 00:09 9m 1s
add: brand new items for Thunderdome and bundles (#3722) Merge Conflict Detection #4778: Commit 673fdf0 pushed by Dimach
October 17, 2023 00:08 7m 4s master220
master220
October 17, 2023 00:08 7m 4s
Fix: old Z2 emo shuttles Merge Conflict Detection #4777: Pull request #3687 synchronize by Dimach
October 17, 2023 00:07 3m 43s
October 17, 2023 00:07 3m 43s
bugfix: nucleation organs desc typo. (#3698) Merge Conflict Detection #4776: Commit 29ed7ef pushed by Dimach
October 17, 2023 00:07 9m 48s master220
master220
October 17, 2023 00:07 9m 48s
bugfix: wrong check for martial arts usability. (#3694) Merge Conflict Detection #4775: Commit d4ced4b pushed by Dimach
October 17, 2023 00:06 10m 18s master220
master220
October 17, 2023 00:06 10m 18s
bugfix: wolpin with vulps head (#3707) Merge Conflict Detection #4774: Commit ef1b858 pushed by Dimach
October 17, 2023 00:06 10m 48s master220
master220
October 17, 2023 00:06 10m 48s
FIX: Allow Skeleton Race plays on his Bones (#3709) Merge Conflict Detection #4773: Commit 713a192 pushed by Dimach
October 17, 2023 00:05 3m 18s master220
master220
October 17, 2023 00:05 3m 18s
bugfix: small map fixes. (#3711) Merge Conflict Detection #4772: Commit 0597307 pushed by Dimach
October 17, 2023 00:05 6m 31s master220
master220
October 17, 2023 00:05 6m 31s
tweak: Bombarda tweaks (#3699) Merge Conflict Detection #4771: Commit b622417 pushed by Dimach
October 17, 2023 00:03 1m 7s master220
master220
October 17, 2023 00:03 1m 7s
add: IPC Combat Upgrade in uplink (#3704) Merge Conflict Detection #4770: Commit 1201b2a pushed by Dimach
October 17, 2023 00:02 2m 20s master220
master220
October 17, 2023 00:02 2m 20s
fix: pistol magazine return his sprite (#3702) Merge Conflict Detection #4769: Commit 58e0f60 pushed by Dimach
October 17, 2023 00:01 6m 25s master220
master220
October 17, 2023 00:01 6m 25s
bugfix: normal drake hood for vulps (#3721) Merge Conflict Detection #4768: Commit e5ce0a6 pushed by Dimach
October 17, 2023 00:00 10m 20s master220
master220
October 17, 2023 00:00 10m 20s
tweak: wallets can hold patches (#3719) Merge Conflict Detection #4767: Commit 1d836d1 pushed by Dimach
October 16, 2023 23:59 8m 32s master220
master220
October 16, 2023 23:59 8m 32s
tweak: crewmember-aid-kit (#3726) Merge Conflict Detection #4766: Commit a9bc43c pushed by Dimach
October 16, 2023 23:58 10m 20s master220
master220
October 16, 2023 23:58 10m 20s
add: Shadow Demon Merge Conflict Detection #4765: Pull request #3616 synchronize by Gottfrei
October 16, 2023 23:44 13s
October 16, 2023 23:44 13s
tweak: crewmember-aid-kit Merge Conflict Detection #4764: Pull request #3726 opened by WolfLox
October 16, 2023 23:40 14s
October 16, 2023 23:40 14s
ProTip! You can narrow down the results and go further in time using created:<2023-10-16 or the other filters available.