Skip to content

Actions: new-frontiers-14/frontier-station-14

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-labeler.yml
287 workflow run results
287 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #81 from Kesiath/anchor-fixes-2 Check Merge Conflicts #190: Commit 00aa854 pushed by Cheackraze
July 25, 2023 04:40 2m 11s master
master
July 25, 2023 04:40 2m 11s
updated anchor changes Check Merge Conflicts #189: Pull request #81 opened by Kesiath
July 25, 2023 03:50 12s
July 25, 2023 03:50 12s
Merge pull request #77 from Kesiath/kes-ship Check Merge Conflicts #188: Commit 9c3f60e pushed by Cheackraze
July 25, 2023 01:03 2m 11s master
master
July 25, 2023 01:03 2m 11s
Large Ship: The Anchor Check Merge Conflicts #187: Pull request #77 synchronize by Cheackraze
July 25, 2023 01:03 16s
July 25, 2023 01:03 16s
Merge pull request #80 from new-frontiers-14/ftlboost Check Merge Conflicts #186: Commit ea4252a pushed by Cheackraze
July 24, 2023 23:51 2m 13s master
master
July 24, 2023 23:51 2m 13s
raise minimum ftl destination size Check Merge Conflicts #185: Pull request #80 opened by Cheackraze
July 24, 2023 23:23 15s
July 24, 2023 23:23 15s
Update cargo_materials.yml Check Merge Conflicts #184: Pull request #79 opened by dvir001
July 24, 2023 10:23 12s
July 24, 2023 10:23 12s
Merge pull request #76 from new-frontiers-14/lpb_touchup Check Merge Conflicts #183: Commit 6dcf21c pushed by Cheackraze
July 24, 2023 08:11 2m 14s master
master
July 24, 2023 08:11 2m 14s
Merge pull request #78 from new-frontiers-14/july_23_upstream_merge Check Merge Conflicts #182: Commit 1daedc3 pushed by Cheackraze
July 24, 2023 08:10 2m 11s master
master
July 24, 2023 08:10 2m 11s
july_23_upstream_merge Check Merge Conflicts #181: Pull request #78 synchronize by Cheackraze
July 24, 2023 08:02 14s
July 24, 2023 08:02 14s
july_23_upstream_merge Check Merge Conflicts #180: Pull request #78 opened by Cheackraze
July 24, 2023 07:48 17s
July 24, 2023 07:48 17s
Large Ship: The Anchor Check Merge Conflicts #179: Pull request #77 synchronize by Kesiath
July 24, 2023 03:15 14s
July 24, 2023 03:15 14s
Large Ship: The Anchor Check Merge Conflicts #178: Pull request #77 synchronize by Kesiath
July 24, 2023 02:42 14s
July 24, 2023 02:42 14s
Large Ship: The Anchor Check Merge Conflicts #177: Pull request #77 opened by Kesiath
July 24, 2023 02:03 12s
July 24, 2023 02:03 12s
lpb_touchup Check Merge Conflicts #176: Pull request #76 opened by Cheackraze
July 24, 2023 00:57 13s
July 24, 2023 00:57 13s
Merge pull request #70 from sTiKyt/trash-prices-reworked Check Merge Conflicts #175: Commit da38280 pushed by Cheackraze
July 23, 2023 19:02 2m 12s master
master
July 23, 2023 19:02 2m 12s
Merge pull request #73 from new-frontiers-14/farmbalance Check Merge Conflicts #174: Commit 4ae534c pushed by Cheackraze
July 23, 2023 18:54 2m 14s master
master
July 23, 2023 18:54 2m 14s
Ships prices refreshed Check Merge Conflicts #173: Pull request #75 opened by sTiKyt
July 23, 2023 07:49 14s
July 23, 2023 07:49 14s
Re-balanced some practical vending machines, sorted and updated inventories Check Merge Conflicts #172: Pull request #74 opened by sTiKyt
July 23, 2023 07:43 13s
July 23, 2023 07:43 13s
Changed default build target from "Debug" to "Tools" in vscode settings Check Merge Conflicts #171: Pull request #72 synchronize by sTiKyt
July 23, 2023 06:48 22s
July 23, 2023 06:48 22s
Changed default build target from "Debug" to "Tools" in vscode settings Check Merge Conflicts #170: Pull request #72 synchronize by sTiKyt
July 23, 2023 06:48 10s
July 23, 2023 06:48 10s
Changed default build target from "Debug" to "Tools" in vscode settings Check Merge Conflicts #169: Pull request #72 synchronize by sTiKyt
July 23, 2023 06:46 10s
July 23, 2023 06:46 10s
balance animal husbandry Check Merge Conflicts #168: Pull request #73 opened by Cheackraze
July 23, 2023 06:46 12s
July 23, 2023 06:46 12s
Changed default build target from "Debug" to "Tools" in vscode settings Check Merge Conflicts #167: Pull request #72 opened by sTiKyt
July 23, 2023 01:23 14s
July 23, 2023 01:23 14s
Trash and some stuff prices implemented Check Merge Conflicts #166: Pull request #70 synchronize by sTiKyt
July 23, 2023 01:15 13s
July 23, 2023 01:15 13s