From 3510158cd8735ae1b5709d27b17688a956256d5c Mon Sep 17 00:00:00 2001
From: cochcoder <103969142+cochcoder@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:34:41 +0000
Subject: [PATCH] Fix processes not showing for Flashforge Guider 2s (#5970)

* Fix processes not showing for Guider 2s

* Fix merge conflicts

* Fix process not showing (after updating PR)
---
 .../machine/Flashforge Guider 2s 0.4 nozzle.json       | 10 +++++-----
 ...0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json |  3 ++-
 ....16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json |  3 ++-
 ...20mm Standard @Flashforge Guider 2s 0.4 nozzle.json |  3 ++-
 .../0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json |  3 ++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json
index 47dc54bb7d..b45d8289b5 100644
--- a/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json	
+++ b/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json	
@@ -12,15 +12,15 @@
 	"printer_variant": "0.4",
 	"printable_area": [
 		"-140x-125",
-        	"140x-125",
-        	"140x125",
-        	"-140x125"
+        "140x-125",
+        "140x125",
+        "-140x125"
 	],
 	"printable_height": "300",
 	"extruder_offset": [ "-20", "10" ],
 	"extruder_clearance_height_to_lid": "70",
-    	"extruder_clearance_height_to_rod": "23",
-    	"extruder_clearance_radius": "40",
+    "extruder_clearance_height_to_rod": "23",
+    "extruder_clearance_radius": "40",
 	"use_relative_e_distances": "0",
 	"auxiliary_fan": "1",
 	"machine_max_acceleration_e": [ "200", "200" ],
diff --git a/resources/profiles/Flashforge/process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json
index 548172068a..23d6db2099 100644
--- a/resources/profiles/Flashforge/process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json	
+++ b/resources/profiles/Flashforge/process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json	
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.12mm Detail @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS001",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.20",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "80%",
diff --git a/resources/profiles/Flashforge/process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json
index 61a5bff705..2ee3d79d14 100644
--- a/resources/profiles/Flashforge/process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json	
+++ b/resources/profiles/Flashforge/process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json	
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS002",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.20",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "25",
diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json
index d9dc079e09..6783df37eb 100644
--- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json	
+++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json	
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.20mm Standard @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS003",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.20",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "50%",
diff --git a/resources/profiles/Flashforge/process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json
index d50de09e28..bb8196f007 100644
--- a/resources/profiles/Flashforge/process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json	
+++ b/resources/profiles/Flashforge/process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json	
@@ -2,8 +2,9 @@
   "type": "process",
   "name": "0.30mm Draft @Flashforge Guider 2s 0.4 nozzle",
   "setting_id": "GS004",
+  "from": "system",
+  "inherits": "fdm_process_flashforge_common",
   "instantiation": "true",
-  "inherits": "fdm_process_flashforge_0.30",
   "adaptive_layer_height": "0",
   "bridge_flow": "1",
   "bridge_speed": "50%",