From 028263e46b243a7b7cfa7073f452ae5fb38aa11a Mon Sep 17 00:00:00 2001
From: Will Berry <73126355+wdberry@users.noreply.github.com>
Date: Tue, 14 Mar 2023 09:06:49 -0400
Subject: [PATCH 1/4] Prevent Picker Dollies from moving Cybernetic Combinator

---
 cybersyn/scripts/main.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua
index eea7286..326aae7 100644
--- a/cybersyn/scripts/main.lua
+++ b/cybersyn/scripts/main.lua
@@ -821,6 +821,13 @@ local function setup_se_compat()
 	end)
 end
 
+local function setup_picker_dollies_compat()
+	IS_PICKER_DOLLIES_PRESENT = remote.interfaces["PickerDollies"] and remote.interfaces["PickerDollies"]["add_blacklist_name"]
+	if IS_PICKER_DOLLIES_PRESENT then
+		remote.call("PickerDollies", "add_blacklist_name", COMBINATOR_NAME)
+		remote.call("PickerDollies", "add_blacklist_name", COMBINATOR_OUT_NAME)
+	end
+end
 
 local function grab_all_settings()
 	mod_settings.enable_planner = settings.global["cybersyn-enable-planner"].value --[[@as boolean]]
@@ -924,6 +931,7 @@ local function main()
 		mod_settings.invert_sign = false
 		init_global()
 		setup_se_compat()
+		setup_picker_dollies_compat()
 		if MANAGER_ENABLED then
 			manager.on_init()
 		end
@@ -939,6 +947,7 @@ local function main()
 
 	script.on_load(function()
 		setup_se_compat()
+		setup_picker_dollies_compat()
 	end)
 
 	if MANAGER_ENABLED then

From 16ba3d2faf33e133932b31f129c412654d284a7b Mon Sep 17 00:00:00 2001
From: mamoniot <mamoniot@protonmail.com>
Date: Tue, 14 Mar 2023 12:45:55 -0400
Subject: [PATCH 2/4] added changelog entry

---
 cybersyn/changelog.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/cybersyn/changelog.txt b/cybersyn/changelog.txt
index 758e283..3ca50eb 100644
--- a/cybersyn/changelog.txt
+++ b/cybersyn/changelog.txt
@@ -1,4 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.14
+Date: 2023-2-5
+  Features:
+    - Added opt-in WIP train and station manager gui (highly experimental, use at your own risk)
+  Bugfixes:
+    - Provider override thresholds now correctly override the required train capacity as well; fix contributed by shopt
+    - Fixed a rare crash relating to an uninitialized network mask on a new station
+    - Fixed a SE space elevator bug that caused incorrect orders when the provider and requester station had the same name
+    - Added an incompatibility error with picker dollies, proper compatibility to come in a later update
+---------------------------------------------------------------------------------------------------
 Version: 1.2.13
 Date: 2023-2-5
   Features:

From 634fe010c2689da11acc1989b455981942dbf02a Mon Sep 17 00:00:00 2001
From: mamoniot <mamoniot@protonmail.com>
Date: Tue, 14 Mar 2023 12:46:15 -0400
Subject: [PATCH 3/4] updated date

---
 cybersyn/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cybersyn/changelog.txt b/cybersyn/changelog.txt
index 3ca50eb..e1515c1 100644
--- a/cybersyn/changelog.txt
+++ b/cybersyn/changelog.txt
@@ -1,6 +1,6 @@
 ---------------------------------------------------------------------------------------------------
 Version: 1.2.14
-Date: 2023-2-5
+Date: 2023-3-14
   Features:
     - Added opt-in WIP train and station manager gui (highly experimental, use at your own risk)
   Bugfixes:

From 8194e9695be3e0d753b1072d4641114d7a6a365b Mon Sep 17 00:00:00 2001
From: Will Berry <73126355+wdberry@users.noreply.github.com>
Date: Tue, 14 Mar 2023 13:18:11 -0400
Subject: [PATCH 4/4] Remove GUI button if exists and GUI disabled

---
 cybersyn/scripts/main.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua
index eea7286..5efd377 100644
--- a/cybersyn/scripts/main.lua
+++ b/cybersyn/scripts/main.lua
@@ -949,6 +949,12 @@ local function main()
 		script.on_nth_tick(mod_settings.manager_update_rate, function()
 			manager.tick(global)
 		end)
+	else
+		local button_flow = mod_gui.get_button_flow(player)
+		local button = button_flow["top_left_button"]
+		if button then
+		    button.destroy()
+		end
 	end
 
 end