fix merge conflict part 1.5

resources/profiles/Flashforge.json

@@ -20,10 +20,6 @@
     {
       "name": "Flashforge Guider 3 Ultra",
       "sub_path": "machine/Flashforge Guider 3 Ultra.json"
-    },
-    {
-      "name": "Flashforge Guider 2s",
-      "sub_path": "machine/Flashforge Guider 2s.json"
     }
   ],
   "process_list": [
@@ -58,6 +54,22 @@
     {
       "name": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle",
       "sub_path": "process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json"
+    },
+	{
+      "name": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle",
+      "sub_path": "process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json"
+	},
+	{
+      "name": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle",
+      "sub_path": "process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json"
+	},
+	{
+      "name": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle",
+      "sub_path": "process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json"
+	},
+	{
+      "name": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle",
+      "sub_path": "process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json"
 	},
 	{
       "name": "0.20mm Standard @Flashforge AD3 0.4 Nozzle",
@@ -74,22 +86,6 @@
     {
       "name": "0.20mm Standard @Flashforge G3U 0.4 Nozzle",
       "sub_path": "process/0.20mm Standard @Flashforge G3U 0.4 Nozzle.json"
-    },
-    {
-      "name": "0.30mm Draft @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.30mm Draft @Flashforge Guider 2s 0.4 nozzle.json"
-    },
-    {
-      "name": "0.20mm Standard @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.20mm Standard @Flashforge Guider 2s 0.4 nozzle.json"
-    },
-    {
-      "name": "0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.16mm Optimal @Flashforge Guider 2s 0.4 nozzle.json"
-    },
-    {
-      "name": "0.12mm Detail @Flashforge Guider 2s 0.4 nozzle",
-      "sub_path": "process/0.12mm Detail @Flashforge Guider 2s 0.4 nozzle.json"
     }
   ],
   "filament_list": [
@@ -122,14 +118,26 @@
       "sub_path": "filament/Flashforge Generic ABS.json"
     },
 	{
+      "name": "Flashforge ABS @FF AD5M 0.25 Nozzle",
+      "sub_path": "filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json"
+	},
+    {
       "name": "Flashforge Generic PETG",
       "sub_path": "filament/Flashforge Generic PETG.json"
     },
 	{
+      "name": "Flashforge PETG @FF AD5M 0.25 Nozzle",
+      "sub_path": "filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json"
+	},
+    {
       "name": "Flashforge Generic PLA",
       "sub_path": "filament/Flashforge Generic PLA.json"
     },
 	{
+      "name": "Flashforge PLA @FF AD5M 0.25 Nozzle",
+      "sub_path": "filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json"
+	},
+    {
       "name": "Flashforge Generic PLA-CF10",
       "sub_path": "filament/Flashforge Generic PLA-CF10.json"
     },
@@ -138,14 +146,26 @@
       "sub_path": "filament/Flashforge Generic PLA-Silk.json"
     },
 	{
+      "name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle",
+      "sub_path": "filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json"
+	},
+    {
       "name": "Flashforge Generic HS PLA",
       "sub_path": "filament/Flashforge Generic HS PLA.json"
     },
 	{
+      "name": "Flashforge HS PLA @FF AD5M 0.25 Nozzle",
+      "sub_path": "filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json"
+	},
+    {
       "name": "Flashforge Generic ASA",
       "sub_path": "filament/Flashforge Generic ASA.json"
     },
 	{
+      "name": "Flashforge ASA @FF AD5M 0.25 Nozzle",
+      "sub_path": "filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json"
+	},
+    {
       "name": "Flashforge Generic PETG-CF10",
       "sub_path": "filament/Flashforge Generic PETG-CF10.json"
     },
@@ -236,12 +256,12 @@
       "sub_path": "machine/fdm_flashforge_common.json"
     },
 	{
-      "name": "fdm_guider3_common",
+      "name": "fdm_adventurer5m_common",
-      "sub_path": "machine/fdm_guider3_common.json"
+      "sub_path": "machine/fdm_adventurer5m_common.json"
     },
 	{
-      "name": "fdm_flashforge_common",
+      "name": "Flashforge Adventurer 5M 0.25 Nozzle",
-      "sub_path": "machine/fdm_adventurer3_common.json"
+      "sub_path": "machine/Flashforge Adventurer 5M 0.25 Nozzle.json"
     },
     {
       "name": "Flashforge Adventurer 5M 0.4 Nozzle",
@@ -250,6 +270,14 @@
     {
       "name": "Flashforge Adventurer 5M 0.6 Nozzle",
       "sub_path": "machine/Flashforge Adventurer 5M 0.6 Nozzle.json"
+    },
+	{
+      "name": "Flashforge Adventurer 5M 0.8 Nozzle",
+      "sub_path": "machine/Flashforge Adventurer 5M 0.8 Nozzle.json"
+    },
+	{
+      "name": "Flashforge Adventurer 5M Pro 0.25 Nozzle",
+      "sub_path": "machine/Flashforge Adventurer 5M Pro 0.25 Nozzle.json"
     },
     {
       "name": "Flashforge Adventurer 5M Pro 0.4 Nozzle",
@@ -258,6 +286,14 @@
     {
       "name": "Flashforge Adventurer 5M Pro 0.6 Nozzle",
       "sub_path": "machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json"
+    },
+	{
+      "name": "Flashforge Adventurer 5M Pro 0.8 Nozzle",
+      "sub_path": "machine/Flashforge Adventurer 5M Pro 0.8 Nozzle.json"
+    },
+	{
+      "name": "fdm_flashforge_common",
+      "sub_path": "machine/fdm_adventurer3_common.json"
     },
 	{
       "name": "Flashforge Adventurer 3 Series 0.4 Nozzle",
@@ -268,12 +304,12 @@
       "sub_path": "machine/Flashforge Adventurer 3 Series 0.6 nozzle.json"
     },
     {
-      "name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
+      "name": "fdm_guider3_common",
-      "sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json"
+      "sub_path": "machine/fdm_guider3_common.json"
     },
     {
-      "name": "Flashforge Guider 2s 0.4 nozzle",
+      "name": "Flashforge Guider 3 Ultra 0.4 Nozzle",
-      "sub_path": "machine/Flashforge Guider 2s 0.4 nozzle.json"
+      "sub_path": "machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json"
     }
   ]
 }

resources/profiles/Flashforge/filament/Flashforge Generic ABS.json

@@ -51,6 +51,6 @@
   "compatible_printers": [
     "Flashforge Adventurer 5M Pro 0.4 Nozzle",
     "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-    "Flashforge Guider 2s 0.4 nozzle"
+	"Flashforge Adventurer 5M Pro 0.8 Nozzle"
   ]
 }

resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json

@@ -20,8 +20,6 @@
         "2"
     ],
   "compatible_printers": [
-    "Flashforge Adventurer 5M Pro 0.4 Nozzle",
-    "Flashforge Adventurer 5M Pro 0.6 Nozzle",
     "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
     "compatible_printers_condition": "",

resources/profiles/Flashforge/filament/Flashforge Generic PETG.json

@@ -84,8 +84,9 @@
   "compatible_printers": [
     "Flashforge Adventurer 5M 0.4 Nozzle",
     "Flashforge Adventurer 5M 0.6 Nozzle",
+	"Flashforge Adventurer 5M 0.8 Nozzle",
     "Flashforge Adventurer 5M Pro 0.4 Nozzle",
     "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-    "Flashforge Guider 2s 0.4 nozzle"
+	"Flashforge Adventurer 5M Pro 0.8 Nozzle"
   ]
 }

resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json

@@ -22,10 +22,11 @@
   "compatible_printers": [
     "Flashforge Adventurer 5M 0.4 Nozzle",
     "Flashforge Adventurer 5M 0.6 Nozzle",
+	"Flashforge Adventurer 5M 0.8 Nozzle",
     "Flashforge Adventurer 5M Pro 0.4 Nozzle",
     "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-    "Flashforge Guider 3 Ultra 0.4 Nozzle",
+	"Flashforge Adventurer 5M Pro 0.8 Nozzle",
-    "Flashforge Guider 2s 0.4 nozzle"
+    "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
   "compatible_printers_condition": "",
   "compatible_prints": [],

resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json

@@ -22,10 +22,11 @@
   "compatible_printers": [
     "Flashforge Adventurer 5M 0.4 Nozzle",
     "Flashforge Adventurer 5M 0.6 Nozzle",
+	"Flashforge Adventurer 5M 0.8 Nozzle",
     "Flashforge Adventurer 5M Pro 0.4 Nozzle",
     "Flashforge Adventurer 5M Pro 0.6 Nozzle",
-    "Flashforge Guider 3 Ultra 0.4 Nozzle",
+	"Flashforge Adventurer 5M Pro 0.8 Nozzle",
-    "Flashforge Guider 2s 0.4 nozzle"
+    "Flashforge Guider 3 Ultra 0.4 Nozzle"
   ],
   "compatible_printers_condition": "",
   "compatible_prints": [],