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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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
bugfix: Spell Cooldown Visual Merge Conflict Detection #4763: Pull request #3725 opened by Gottfrei
October 16, 2023 22:16 15s
October 16, 2023 22:16 15s
bugfix: fixed incorrect improvised shotgun rendering Merge Conflict Detection #4762: Pull request #3724 opened by Vladisvell
October 16, 2023 21:47 17s
October 16, 2023 21:47 17s
add: coca bush, cocaine, crack, Mate de Coca Merge Conflict Detection #4761: Pull request #3723 opened by ROdenFL
October 16, 2023 20:58 14s
October 16, 2023 20:58 14s
add: brand new items for Thunderdome and bundles Merge Conflict Detection #4760: Pull request #3722 opened by Vladisvell
October 16, 2023 20:55 14s
October 16, 2023 20:55 14s
refactor: better smoke and foam Merge Conflict Detection #4759: Pull request #3713 synchronize by definitelynotspaghetti
October 16, 2023 15:39 17s
October 16, 2023 15:39 17s
bugfix: normal drake hood for vulps Merge Conflict Detection #4758: Pull request #3721 opened by NightDawnFox
October 16, 2023 13:48 14s
October 16, 2023 13:48 14s
balance: Supermatter now generates and heats gases according to thermodynamic laws. Merge Conflict Detection #4757: Pull request #3716 synchronize by Vladisvell
October 15, 2023 18:16 20s
October 15, 2023 18:16 20s
balance: Supermatter now generates and heats gases according to thermodynamic laws. Merge Conflict Detection #4756: Pull request #3716 ready_for_review by Vladisvell
October 15, 2023 17:17 12s
October 15, 2023 17:17 12s
balance: Supermatter now generates and heats gases according to thermodynamic laws. Merge Conflict Detection #4755: Pull request #3716 synchronize by Vladisvell
October 15, 2023 17:14 13s
October 15, 2023 17:14 13s
refactor: better smoke and foam Merge Conflict Detection #4754: Pull request #3713 synchronize by definitelynotspaghetti
October 15, 2023 16:58 15s
October 15, 2023 16:58 15s