Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,131 workflow run results
1,131 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Build order rewamp Check for merge conflicts #1131: Pull request #165 opened by xDanilcusx
March 20, 2024 22:48 9s
March 20, 2024 22:48 9s
AI tweaks and fixes Check for merge conflicts #1130: Pull request #164 opened by xDanilcusx
March 20, 2024 22:36 14s
March 20, 2024 22:36 14s
Prime Priority Rolls for Discord Linked Players Check for merge conflicts #1129: Pull request #163 synchronize by morrowwolf
March 20, 2024 21:01 11s
March 20, 2024 21:01 11s
Prime Priority Rolls for Discord Linked Players Check for merge conflicts #1128: Pull request #163 opened by morrowwolf
March 20, 2024 17:32 17s
March 20, 2024 17:32 17s
Crusher SFX Check for merge conflicts #1127: Pull request #151 synchronize by xDanilcusx
March 20, 2024 11:30 13s
March 20, 2024 11:30 13s
Clothing lore buff (#159) Check for merge conflicts #1126: Commit 4423878 pushed by FslashN
March 20, 2024 00:19 2m 15s master
master
March 20, 2024 00:19 2m 15s
shotguns on golden arrow once again come preloaded with special buck … Check for merge conflicts #1125: Commit dff55fc pushed by FslashN
March 20, 2024 00:10 2m 15s master
master
March 20, 2024 00:10 2m 15s
Special buckshot will now deal mostly normal buckshot Check for merge conflicts #1124: Pull request #162 synchronize by KoishiVibe
March 19, 2024 23:02 5m 52s
March 19, 2024 23:02 5m 52s
Special buckshot will now deal mostly normal buckshot Check for merge conflicts #1123: Pull request #162 opened by KoishiVibe
March 19, 2024 23:01 11s
March 19, 2024 23:01 11s
new xeno caste: soldier Check for merge conflicts #1122: Pull request #161 opened by AndroBetel
March 19, 2024 22:52 11s
March 19, 2024 22:52 11s
shotguns on golden arrow once again come preloaded with special buck Check for merge conflicts #1121: Pull request #160 synchronize by AndroBetel
March 19, 2024 20:51 6m 10s
March 19, 2024 20:51 6m 10s
shotguns on golden arrow once again come preloaded with special buck Check for merge conflicts #1120: Pull request #160 opened by AndroBetel
March 19, 2024 20:51 12s
March 19, 2024 20:51 12s
M60 retouch, mostly lore, a little statistical Check for merge conflicts #1119: Pull request #158 synchronize by KoishiVibe
March 19, 2024 18:26 13s
March 19, 2024 18:26 13s
M60 retouch, mostly lore, a little statistical Check for merge conflicts #1118: Pull request #158 synchronize by KoishiVibe
March 19, 2024 14:41 4m 5s
March 19, 2024 14:41 4m 5s
Clothing lore buff Check for merge conflicts #1117: Pull request #159 opened by KoishiVibe
March 19, 2024 14:38 1m 25s
March 19, 2024 14:38 1m 25s
M60 retouch, mostly lore, a little statistical Check for merge conflicts #1116: Pull request #158 opened by KoishiVibe
March 19, 2024 13:51 14s
March 19, 2024 13:51 14s
Flavor text for uniforms and armor Check for merge conflicts #1115: Pull request #157 opened by KoishiVibe
March 19, 2024 06:16 16s
March 19, 2024 06:16 16s
wood replacement sprites Check for merge conflicts #1114: Pull request #156 opened by AmoryBlaine
March 18, 2024 15:53 14s
March 18, 2024 15:53 14s
Classic Camo to Jungle Camo Edit Check for merge conflicts #1113: Pull request #153 synchronize by AmoryBlaine
March 18, 2024 14:11 14s
March 18, 2024 14:11 14s
Classic Camo to Jungle Camo Edit Check for merge conflicts #1112: Pull request #153 synchronize by AmoryBlaine
March 18, 2024 13:37 13s
March 18, 2024 13:37 13s
VP78 Semi-Buff (#135) Check for merge conflicts #1111: Commit 5fc544e pushed by morrowwolf
March 18, 2024 05:30 3m 55s master
master
March 18, 2024 05:30 3m 55s
dog tags are now properly named as dog tags (#148) Check for merge conflicts #1110: Commit 4f46b99 pushed by morrowwolf
March 18, 2024 05:29 4m 47s master
master
March 18, 2024 05:29 4m 47s
GM infesting subpanel (#134) Check for merge conflicts #1109: Commit ef310dd pushed by morrowwolf
March 18, 2024 05:29 5m 20s master
master
March 18, 2024 05:29 5m 20s
GM infesting subpanel Check for merge conflicts #1108: Pull request #134 ready_for_review by morrowwolf
March 18, 2024 05:28 5m 31s
March 18, 2024 05:28 5m 31s
SG Balloon alerts (#152) Check for merge conflicts #1107: Commit 914ca1d pushed by morrowwolf
March 18, 2024 05:28 5m 28s master
master
March 18, 2024 05:28 5m 28s