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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Feat: Bullet resist for shadowling instead of laser resist Merge Conflict Detection #5163: Pull request #3818 opened by Honker9999999
November 4, 2023 07:48 10s
November 4, 2023 07:48 10s
balance: bomb guardian no longer dismember legs and bomb damage nerfs Merge Conflict Detection #5162: Pull request #3817 opened by Vladisvell
November 3, 2023 22:11 14s
November 3, 2023 22:11 14s
add: chatbubble for telepathy users. Merge Conflict Detection #5161: Pull request #3815 synchronize by Daeberdir
November 3, 2023 21:15 19s
November 3, 2023 21:15 19s
balance: speedloaders can be loaded from ammoboxes. Merge Conflict Detection #5160: Pull request #3816 ready_for_review by Daeberdir
November 3, 2023 20:34 12s
November 3, 2023 20:34 12s
balance: speedloaders can be loaded from ammoboxes. Merge Conflict Detection #5159: Pull request #3816 synchronize by Daeberdir
November 3, 2023 20:27 14s
November 3, 2023 20:27 14s
balance: speedloaders can be loaded from ammoboxes. Merge Conflict Detection #5158: Pull request #3816 synchronize by Daeberdir
November 3, 2023 20:22 14s
November 3, 2023 20:22 14s
balance: speedloaders can be loaded from ammoboxes. Merge Conflict Detection #5157: Pull request #3816 synchronize by Daeberdir
November 3, 2023 20:20 15s
November 3, 2023 20:20 15s
balance: speedloaders can be loaded from ammoboxes. Merge Conflict Detection #5156: Pull request #3816 opened by Daeberdir
November 3, 2023 20:09 10s
November 3, 2023 20:09 10s
add: chatbubble for telepathy users. Merge Conflict Detection #5155: Pull request #3815 synchronize by Daeberdir
November 3, 2023 19:57 17s
November 3, 2023 19:57 17s
add: chatbubble for telepathy users. Merge Conflict Detection #5154: Pull request #3815 opened by Daeberdir
November 3, 2023 19:56 16s
November 3, 2023 19:56 16s
qol: Water tiles now extinguish burning mobs. Merge Conflict Detection #5153: Pull request #3814 synchronize by Vladisvell
November 3, 2023 18:10 18s
November 3, 2023 18:10 18s
qol: Water tiles now extinguish burning mobs. Merge Conflict Detection #5152: Pull request #3814 opened by Vladisvell
November 3, 2023 15:24 18s
November 3, 2023 15:24 18s
Suragi Jackets 1.1 Patch Merge Conflict Detection #5151: Pull request #3750 synchronize by XaycBC
November 3, 2023 14:21 13s
November 3, 2023 14:21 13s
add: Space Prison Ruin Merge Conflict Detection #5150: Pull request #3782 synchronize by mrWhiteFox364
November 3, 2023 13:45 15s
November 3, 2023 13:45 15s
add: Space Prison Ruin Merge Conflict Detection #5149: Pull request #3782 synchronize by mrWhiteFox364
November 3, 2023 13:43 15s
November 3, 2023 13:43 15s
bugfix: bomb implant activation not work (#3813) Merge Conflict Detection #5148: Commit be16bb4 pushed by Dimach
November 3, 2023 13:26 8m 24s master220
master220
November 3, 2023 13:26 8m 24s
bugfix: bomb implant activation not work Merge Conflict Detection #5147: Pull request #3813 synchronize by Dimach
November 3, 2023 13:20 17s
November 3, 2023 13:20 17s
bugfix: bomb implant activation not work Merge Conflict Detection #5146: Pull request #3813 opened by Dimach
November 3, 2023 13:19 18s
November 3, 2023 13:19 18s
bugfix: meson's vision now realy saving from that two farwas and even singulo. Merge Conflict Detection #5145: Pull request #3812 synchronize by Daeberdir
November 3, 2023 12:55 16s
November 3, 2023 12:55 16s
bugfix: meson's vision now realy saving from that two farwas and even singulo. Merge Conflict Detection #5144: Pull request #3812 opened by Daeberdir
November 3, 2023 12:48 23s
November 3, 2023 12:48 23s
bugfix: text corrections for spessuit storages and smol combat defib. Merge Conflict Detection #5143: Pull request #3811 opened by Daeberdir
November 3, 2023 12:33 17s
November 3, 2023 12:33 17s
bugfix: wooden buckets now do not become blue Merge Conflict Detection #5142: Pull request #3810 opened by Vladisvell
November 3, 2023 10:51 13s
November 3, 2023 10:51 13s
bugfix: bread monster's max hp now rises on teleportation Merge Conflict Detection #5141: Pull request #3809 opened by Vladisvell
November 3, 2023 10:49 14s
November 3, 2023 10:49 14s
qol: Cleanbots now can spread between cleanable decals Merge Conflict Detection #5140: Pull request #3806 synchronize by Vladisvell
November 2, 2023 17:26 18s
November 2, 2023 17:26 18s
qol: Cleanbots now can spread between cleanable decals Merge Conflict Detection #5139: Pull request #3806 synchronize by Vladisvell
November 2, 2023 17:18 15s
November 2, 2023 17:18 15s