Stop Malformed Network Responses from Crashing the App

Duet, MKS and UltiMaker parsed print host replies with boost read_json inside the HTTP completion callback with no try, so an HTML or truncated reply threw out of the Physical Printer Test button and terminated the app, or killed the upload queue thread. The five identical copies of the parser (ESP3D's and Flashforge's were unused) are replaced by one shared PrintHost::get_err_code_from_body that reports a non-JSON reply as an error. The upload queue now catches a failing job per job, so one bad upload no longer leaves later jobs queued forever. Flashforge read material station slots with nlohmann value(), which throws on off-type fields or non-object entries. The parsing moves into Flashforge::parse_material_slots, which reads fields leniently with the existing try_parse_json_int and skips bad entries. UserManager::parse_json parsed the payload before its try block; the parse now happens inside it.
2026-09-28 11:21:30 +00:00 · 2026-09-28 13:00:58 +08:00
113 changed files with 652 additions and 1114 deletions
@@ -1,6 +1,6 @@
 {
 	"name": "Blocks",
-	"version": "02.04.00.13",
+	"version": "02.04.00.04",
 	"force_update": "0",
 	"description": "Blocks configurations",
 	"machine_model_list": [
@@ -43,8 +43,8 @@
 			"sub_path": "process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.json"
+			"name": "0.20mm Standard 0.4 nozzle @Blocks",
+			"sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks.json"
 		},
 		{
 			"name": "0.20mm Standard 0.4 nozzle @Blocks_RD50_V2",
@@ -55,8 +55,8 @@
 			"sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.24mm Draft 0.4 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.json"
+			"name": "0.24mm Draft 0.4 nozzle @Blocks",
+			"sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks.json"
 		},
 		{
 			"name": "0.24mm Draft 0.4 nozzle @Blocks_RD50_V2",
@@ -75,8 +75,8 @@
 			"sub_path": "process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.json"
+			"name": "0.30mm Extra Draft 0.4 nozzle @Blocks",
+			"sub_path": "process/0.30mm Extra Draft 0.4 nozzle @Blocks.json"
 		},
 		{
 			"name": "fdm_process_common 0.6 nozzle",
@@ -111,8 +111,8 @@
 			"sub_path": "process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.json"
+			"name": "0.30mm Standard 0.6 nozzle @Blocks",
+			"sub_path": "process/0.30mm Standard 0.6 nozzle @Blocks.json"
 		},
 		{
 			"name": "0.32mm Draft 0.6 nozzle @Blocks_RD50_V2",
@@ -131,12 +131,12 @@
 			"sub_path": "process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.40mm Draft 0.6 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json"
+			"name": "0.40mm Draft 0.6 nozzle @Blocks",
+			"sub_path": "process/0.40mm Draft 0.6 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.json"
+			"name": "0.30mm Optimal 0.8 nozzle @Blocks",
+			"sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks.json"
 		},
 		{
 			"name": "0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2",
@@ -155,8 +155,8 @@
 			"sub_path": "process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.json"
+			"name": "0.40mm Standard 0.8 nozzle @Blocks",
+			"sub_path": "process/0.40mm Standard 0.8 nozzle @Blocks.json"
 		},
 		{
 			"name": "0.46mm Draft 0.8 nozzle @Blocks_RD50_V2",
@@ -167,8 +167,8 @@
 			"sub_path": "process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.50mm Draft 0.8 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.json"
+			"name": "0.50mm Draft 0.8 nozzle @Blocks",
+			"sub_path": "process/0.50mm Draft 0.8 nozzle @Blocks.json"
 		},
 		{
 			"name": "0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2",
@@ -179,36 +179,36 @@
 			"sub_path": "process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json"
 		},
 		{
-			"name": "0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json"
+			"name": "0.30mm Optimal 1.0 nozzle @Blocks",
+			"sub_path": "process/0.30mm Optimal 1.0 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json"
+			"name": "0.50mm Standard 1.0 nozzle @Blocks",
+			"sub_path": "process/0.50mm Standard 1.0 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.60mm Draft 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json"
+			"name": "0.60mm Draft 1.0 nozzle @Blocks",
+			"sub_path": "process/0.60mm Draft 1.0 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json"
+			"name": "0.70mm Extra Draft 1.0 nozzle @Blocks",
+			"sub_path": "process/0.70mm Extra Draft 1.0 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json"
+			"name": "0.50mm Optimal 1.2 nozzle @Blocks",
+			"sub_path": "process/0.50mm Optimal 1.2 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json"
+			"name": "0.60mm Standard 1.2 nozzle @Blocks",
+			"sub_path": "process/0.60mm Standard 1.2 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.70mm Draft 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json"
+			"name": "0.70mm Draft 1.2 nozzle @Blocks",
+			"sub_path": "process/0.70mm Draft 1.2 nozzle @Blocks.json"
 		},
 		{
-			"name": "0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json"
+			"name": "0.80mm Extra Draft 1.2 nozzle @Blocks",
+			"sub_path": "process/0.80mm Extra Draft 1.2 nozzle @Blocks.json"
 		}
 	],
 	"filament_list": [
@@ -249,148 +249,48 @@
 			"sub_path": "filament/fdm_filament_tpu.json"
 		},
 		{
-			"name": "Blocks ABS @base",
-			"sub_path": "filament/Blocks ABS @base.json"
+			"name": "Generic ABS @Blocks",
+			"sub_path": "filament/Generic ABS @Blocks.json"
 		},
 		{
-			"name": "Blocks ASA @base",
-			"sub_path": "filament/Blocks ASA @base.json"
+			"name": "Generic ASA @Blocks",
+			"sub_path": "filament/Generic ASA @Blocks.json"
 		},
 		{
-			"name": "Blocks ASA-CF @base",
-			"sub_path": "filament/Blocks ASA-CF @base.json"
+			"name": "Generic ASA-CF @Blocks",
+			"sub_path": "filament/Generic ASA-CF @Blocks.json"
 		},
 		{
-			"name": "Blocks PA @base",
-			"sub_path": "filament/Blocks PA @base.json"
+			"name": "Generic PA @Blocks",
+			"sub_path": "filament/Generic PA @Blocks.json"
 		},
 		{
-			"name": "Blocks PA-CF @base",
-			"sub_path": "filament/Blocks PA-CF @base.json"
+			"name": "Generic PA-CF @Blocks",
+			"sub_path": "filament/Generic PA-CF @Blocks.json"
 		},
 		{
-			"name": "Blocks PC @base",
-			"sub_path": "filament/Blocks PC @base.json"
+			"name": "Generic PC @Blocks",
+			"sub_path": "filament/Generic PC @Blocks.json"
 		},
 		{
-			"name": "Blocks PETG @base",
-			"sub_path": "filament/Blocks PETG @base.json"
+			"name": "Generic PETG @Blocks",
+			"sub_path": "filament/Generic PETG @Blocks.json"
 		},
 		{
-			"name": "Blocks PLA @base",
-			"sub_path": "filament/Blocks PLA @base.json"
+			"name": "Generic PLA @Blocks",
+			"sub_path": "filament/Generic PLA @Blocks.json"
 		},
 		{
-			"name": "Blocks PLA-CF @base",
-			"sub_path": "filament/Blocks PLA-CF @base.json"
+			"name": "Generic PLA-CF @Blocks",
+			"sub_path": "filament/Generic PLA-CF @Blocks.json"
 		},
 		{
-			"name": "Blocks PVA @base",
-			"sub_path": "filament/Blocks PVA @base.json"
+			"name": "Generic PVA @Blocks",
+			"sub_path": "filament/Generic PVA @Blocks.json"
 		},
 		{
-			"name": "Blocks TPU @base",
-			"sub_path": "filament/Blocks TPU @base.json"
-		},
-		{
-			"name": "Blocks ABS @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks ABS @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks ABS @Blocks_RF50",
-			"sub_path": "filament/Blocks ABS @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks ASA @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks ASA @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks ASA @Blocks_RF50",
-			"sub_path": "filament/Blocks ASA @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks ASA-CF @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks ASA-CF @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks ASA-CF @Blocks_RF50",
-			"sub_path": "filament/Blocks ASA-CF @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks PA @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks PA @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks PA @Blocks_RF50",
-			"sub_path": "filament/Blocks PA @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks PA-CF @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks PA-CF @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks PA-CF @Blocks_RF50",
-			"sub_path": "filament/Blocks PA-CF @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks PC @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks PC @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks PC @Blocks_RF50",
-			"sub_path": "filament/Blocks PC @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks PETG @Blocks_Pro_S100",
-			"sub_path": "filament/Blocks PETG @Blocks_Pro_S100.json"
-		},
-		{
-			"name": "Blocks PETG @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks PETG @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks PETG @Blocks_RF50",
-			"sub_path": "filament/Blocks PETG @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks PLA @Blocks_Pro_S100",
-			"sub_path": "filament/Blocks PLA @Blocks_Pro_S100.json"
-		},
-		{
-			"name": "Blocks PLA @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks PLA @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks PLA @Blocks_RF50",
-			"sub_path": "filament/Blocks PLA @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks PLA-CF @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks PLA-CF @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks PLA-CF @Blocks_RF50",
-			"sub_path": "filament/Blocks PLA-CF @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks PVA @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks PVA @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks PVA @Blocks_RF50",
-			"sub_path": "filament/Blocks PVA @Blocks_RF50.json"
-		},
-		{
-			"name": "Blocks TPU @Blocks_Pro_S100",
-			"sub_path": "filament/Blocks TPU @Blocks_Pro_S100.json"
-		},
-		{
-			"name": "Blocks TPU @Blocks_RD50_V2",
-			"sub_path": "filament/Blocks TPU @Blocks_RD50_V2.json"
-		},
-		{
-			"name": "Blocks TPU @Blocks_RF50",
-			"sub_path": "filament/Blocks TPU @Blocks_RF50.json"
+			"name": "Generic TPU @Blocks",
+			"sub_path": "filament/Generic TPU @Blocks.json"
 		}
 	],
 	"machine_list": [
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks ABS @Blocks_RD50_V2",
-	"inherits": "Blocks ABS @base",
-	"from": "system",
-	"setting_id": "qhQ0qQDGJgsueCAF",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic ABS;Generic ABS @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks ABS @Blocks_RF50",
-	"inherits": "Blocks ABS @base",
-	"from": "system",
-	"setting_id": "bGYMFFdKiROKuSiY",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks ASA @Blocks_RD50_V2",
-	"inherits": "Blocks ASA @base",
-	"from": "system",
-	"setting_id": "HW7xDXThvpVFbMq5",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic ASA;Generic ASA @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks ASA @Blocks_RF50",
-	"inherits": "Blocks ASA @base",
-	"from": "system",
-	"setting_id": "lBW7SCsvawi4icNU",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks ASA-CF @Blocks_RD50_V2",
-	"inherits": "Blocks ASA-CF @base",
-	"from": "system",
-	"setting_id": "x5ksnGLGGy1PgDns",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic ASA-CF;Generic ASA-CF @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks ASA-CF @Blocks_RF50",
-	"inherits": "Blocks ASA-CF @base",
-	"from": "system",
-	"setting_id": "pcbd5qFiMZAvDPg1",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PA @Blocks_RD50_V2",
-	"inherits": "Blocks PA @base",
-	"from": "system",
-	"setting_id": "gxD81n2jjrReLD29",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic PA;Generic PA @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PA @Blocks_RF50",
-	"inherits": "Blocks PA @base",
-	"from": "system",
-	"setting_id": "PzKxRMDnQUzVWRer",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,17 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PA @base",
-	"inherits": "fdm_filament_pa",
-	"from": "system",
-	"filament_id": "OFidOgK4",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
-	"filament_flow_ratio": [
-		"0.98"
-	],
-	"filament_max_volumetric_speed": [
-		"10"
-	]
-}
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PA-CF @Blocks_RD50_V2",
-	"inherits": "Blocks PA-CF @base",
-	"from": "system",
-	"setting_id": "EtbeKx3rbhUo1TtM",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic PA-CF;Generic PA-CF @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PA-CF @Blocks_RF50",
-	"inherits": "Blocks PA-CF @base",
-	"from": "system",
-	"setting_id": "udI8Q4X7HaPIaPt4",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PC @Blocks_RD50_V2",
-	"inherits": "Blocks PC @base",
-	"from": "system",
-	"setting_id": "HLc0shWnKwJzSFyW",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic PC;Generic PC @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PC @Blocks_RF50",
-	"inherits": "Blocks PC @base",
-	"from": "system",
-	"setting_id": "9a6bccZopMTeNHYu",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,17 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PC @base",
-	"inherits": "fdm_filament_pc",
-	"from": "system",
-	"filament_id": "OFlGY0MN",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
-	"filament_flow_ratio": [
-		"0.94"
-	],
-	"filament_max_volumetric_speed": [
-		"10"
-	]
-}
@@ -1,16 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PETG @Blocks_Pro_S100",
-	"inherits": "Blocks PETG @base",
-	"from": "system",
-	"setting_id": "AhMR49fcFqtrQ6hI",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS Pro S100 0.4 nozzle",
-		"BLOCKS Pro S100 0.6 nozzle",
-		"BLOCKS Pro S100 0.8 nozzle",
-		"BLOCKS Pro S100 1.0 nozzle",
-		"BLOCKS Pro S100 1.2 nozzle"
-	],
-	"renamed_from": "Blocks Generic PETG;Generic PETG @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PETG @Blocks_RD50_V2",
-	"inherits": "Blocks PETG @base",
-	"from": "system",
-	"setting_id": "3v7ah1zVG8MERPSJ",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	]
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PETG @Blocks_RF50",
-	"inherits": "Blocks PETG @base",
-	"from": "system",
-	"setting_id": "S7weR19wo9meJ6Yz",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,16 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PLA @Blocks_Pro_S100",
-	"inherits": "Blocks PLA @base",
-	"from": "system",
-	"setting_id": "vWojuLYIfduLGFLL",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS Pro S100 0.4 nozzle",
-		"BLOCKS Pro S100 0.6 nozzle",
-		"BLOCKS Pro S100 0.8 nozzle",
-		"BLOCKS Pro S100 1.0 nozzle",
-		"BLOCKS Pro S100 1.2 nozzle"
-	],
-	"renamed_from": "Blocks Generic PLA;Generic PLA @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PLA @Blocks_RD50_V2",
-	"inherits": "Blocks PLA @base",
-	"from": "system",
-	"setting_id": "y7y8NcXNdp17sJUs",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	]
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PLA @Blocks_RF50",
-	"inherits": "Blocks PLA @base",
-	"from": "system",
-	"setting_id": "jt1MJF4eZzkkscEJ",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PLA-CF @Blocks_RD50_V2",
-	"inherits": "Blocks PLA-CF @base",
-	"from": "system",
-	"setting_id": "lhBtMKP1DmOB3HOI",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic PLA-CF;Generic PLA-CF @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PLA-CF @Blocks_RF50",
-	"inherits": "Blocks PLA-CF @base",
-	"from": "system",
-	"setting_id": "6CU83mAyhcZ4FCPI",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,23 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PLA-CF @base",
-	"inherits": "fdm_filament_pla",
-	"from": "system",
-	"filament_id": "OF6FfwOP",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_max_volumetric_speed": [
-		"20"
-	],
-	"filament_type": [
-		"PLA-CF"
-	],
-	"slow_down_layer_time": [
-		"7"
-	]
-}
@@ -1,14 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PVA @Blocks_RD50_V2",
-	"inherits": "Blocks PVA @base",
-	"from": "system",
-	"setting_id": "hREDqwKF6qyKkakp",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	],
-	"renamed_from": "Blocks Generic PVA;Generic PVA @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PVA @Blocks_RF50",
-	"inherits": "Blocks PVA @base",
-	"from": "system",
-	"setting_id": "q6pKqHY7Iz4OZaAC",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,17 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks PVA @base",
-	"inherits": "fdm_filament_pva",
-	"from": "system",
-	"filament_id": "OFqcNuE1",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
-	"filament_flow_ratio": [
-		"0.98"
-	],
-	"filament_max_volumetric_speed": [
-		"20"
-	]
-}
@@ -1,16 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks TPU @Blocks_Pro_S100",
-	"inherits": "Blocks TPU @base",
-	"from": "system",
-	"setting_id": "6Rkz2je91JRTRoTi",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS Pro S100 0.4 nozzle",
-		"BLOCKS Pro S100 0.6 nozzle",
-		"BLOCKS Pro S100 0.8 nozzle",
-		"BLOCKS Pro S100 1.0 nozzle",
-		"BLOCKS Pro S100 1.2 nozzle"
-	],
-	"renamed_from": "Blocks Generic TPU;Generic TPU @Blocks"
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks TPU @Blocks_RD50_V2",
-	"inherits": "Blocks TPU @base",
-	"from": "system",
-	"setting_id": "mkCqRQTtXldzoEUg",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RD50 V2 0.4 nozzle",
-		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RD50 V2 0.8 nozzle"
-	]
-}
@@ -1,13 +0,0 @@
-{
-	"type": "filament",
-	"name": "Blocks TPU @Blocks_RF50",
-	"inherits": "Blocks TPU @base",
-	"from": "system",
-	"setting_id": "bCCvu5Ow1JkwIrRR",
-	"instantiation": "true",
-	"compatible_printers": [
-		"BLOCKS RF50 0.4 nozzle",
-		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle"
-	]
-}
@@ -1,13 +1,12 @@
 {
 	"type": "filament",
-	"name": "Blocks ABS @base",
+	"name": "Generic ABS @Blocks",
 	"inherits": "fdm_filament_abs",
+	"renamed_from": "Blocks Generic ABS",
 	"from": "system",
-	"filament_id": "OFBBhiX8",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
+	"setting_id": "TL1Q1kA4t36GGObG",
+	"filament_id": "OFY9muEs",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
 	],
@@ -82,5 +81,13 @@
 	],
 	"during_print_exhaust_fan_speed": [
 		"100"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
@@ -1,13 +1,12 @@
 {
 	"type": "filament",
-	"name": "Blocks ASA @base",
+	"name": "Generic ASA @Blocks",
 	"inherits": "fdm_filament_asa",
+	"renamed_from": "Blocks Generic ASA",
 	"from": "system",
-	"filament_id": "OFTz2YXa",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
+	"setting_id": "xP7cB4RHgbm4cYDD",
+	"filament_id": "OFLPAxz3",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
 	],
@@ -82,5 +81,13 @@
 	],
 	"during_print_exhaust_fan_speed": [
 		"100"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
@@ -1,13 +1,12 @@
 {
 	"type": "filament",
-	"name": "Blocks ASA-CF @base",
+	"name": "Generic ASA-CF @Blocks",
 	"inherits": "fdm_filament_asa",
+	"renamed_from": "Blocks Generic ASA-CF",
 	"from": "system",
-	"filament_id": "OF8b9I7o",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
+	"setting_id": "ju4ue7yJoz3ujny6",
+	"filament_id": "OF53eLVD",
+	"instantiation": "true",
 	"filament_type": [
 		"ASA-CF"
 	],
@@ -85,5 +84,13 @@
 	],
 	"during_print_exhaust_fan_speed": [
 		"100"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
@@ -0,0 +1,24 @@
+{
+	"type": "filament",
+	"name": "Generic PA @Blocks",
+	"inherits": "fdm_filament_pa",
+	"renamed_from": "Blocks Generic PA",
+	"from": "system",
+	"setting_id": "hL3p8gAeciwDkjNK",
+	"filament_id": "OFg8ndtj",
+	"instantiation": "true",
+	"filament_flow_ratio": [
+		"0.98"
+	],
+	"filament_max_volumetric_speed": [
+		"10"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
+	]
+}
@@ -1,13 +1,12 @@
 {
 	"type": "filament",
-	"name": "Blocks PA-CF @base",
+	"name": "Generic PA-CF @Blocks",
 	"inherits": "fdm_filament_pa",
+	"renamed_from": "Blocks Generic PA-CF",
 	"from": "system",
-	"filament_id": "OFdWrXpL",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
+	"setting_id": "T6SO0WRdnG6wcyG8",
+	"filament_id": "OFQLcbps",
+	"instantiation": "true",
 	"filament_type": [
 		"PA-CF"
 	],
@@ -88,5 +87,13 @@
 	],
 	"during_print_exhaust_fan_speed": [
 		"80"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
@@ -0,0 +1,24 @@
+{
+	"type": "filament",
+	"name": "Generic PC @Blocks",
+	"inherits": "fdm_filament_pc",
+	"renamed_from": "Blocks Generic PC",
+	"from": "system",
+	"setting_id": "Xhs8PjtmwwVj0ksE",
+	"filament_id": "OFLakOUI",
+	"instantiation": "true",
+	"filament_flow_ratio": [
+		"0.94"
+	],
+	"filament_max_volumetric_speed": [
+		"10"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
+	]
+}
@@ -1,13 +1,12 @@
 {
 	"type": "filament",
-	"name": "Blocks PETG @base",
+	"name": "Generic PETG @Blocks",
 	"inherits": "fdm_filament_petg",
+	"renamed_from": "Blocks Generic PETG",
 	"from": "system",
-	"filament_id": "OF9t1Ga0",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
+	"setting_id": "NgzPlYItKHbmGgv3",
+	"filament_id": "OFYPdQJh",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.94"
 	],
@@ -82,5 +81,18 @@
 	],
 	"slow_down_layer_time": [
 		"5"
+	],
+	"compatible_printers": [
+		"BLOCKS Pro S100 0.4 nozzle",
+		"BLOCKS Pro S100 0.6 nozzle",
+		"BLOCKS Pro S100 0.8 nozzle",
+		"BLOCKS Pro S100 1.0 nozzle",
+		"BLOCKS Pro S100 1.2 nozzle",
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
@@ -1,13 +1,12 @@
 {
 	"type": "filament",
-	"name": "Blocks PLA @base",
+	"name": "Generic PLA @Blocks",
 	"inherits": "fdm_filament_pla",
+	"renamed_from": "Blocks Generic PLA",
 	"from": "system",
-	"filament_id": "OFVGAC8g",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
+	"setting_id": "kjhuttx4T8OtTNmV",
+	"filament_id": "OFDSrzZ8",
+	"instantiation": "true",
 	"filament_flow_ratio": [
 		"0.95"
 	],
@@ -40,5 +39,18 @@
 	],
 	"during_print_exhaust_fan_speed": [
 		"100"
+	],
+	"compatible_printers": [
+		"BLOCKS Pro S100 0.4 nozzle",
+		"BLOCKS Pro S100 0.6 nozzle",
+		"BLOCKS Pro S100 0.8 nozzle",
+		"BLOCKS Pro S100 1.0 nozzle",
+		"BLOCKS Pro S100 1.2 nozzle",
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
@@ -0,0 +1,30 @@
+{
+	"type": "filament",
+	"name": "Generic PLA-CF @Blocks",
+	"inherits": "fdm_filament_pla",
+	"renamed_from": "Blocks Generic PLA-CF",
+	"from": "system",
+	"setting_id": "oKUqzwAWMrpiyGLf",
+	"filament_id": "OFWbdGsC",
+	"instantiation": "true",
+	"filament_flow_ratio": [
+		"0.95"
+	],
+	"filament_max_volumetric_speed": [
+		"20"
+	],
+	"filament_type": [
+		"PLA-CF"
+	],
+	"slow_down_layer_time": [
+		"7"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
+	]
+}
@@ -0,0 +1,24 @@
+{
+	"type": "filament",
+	"name": "Generic PVA @Blocks",
+	"inherits": "fdm_filament_pva",
+	"renamed_from": "Blocks Generic PVA",
+	"from": "system",
+	"setting_id": "tNw3oe7VovLkgUbB",
+	"filament_id": "OFDvXujf",
+	"instantiation": "true",
+	"filament_flow_ratio": [
+		"0.98"
+	],
+	"filament_max_volumetric_speed": [
+		"20"
+	],
+	"compatible_printers": [
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
+	]
+}
@@ -1,13 +1,12 @@
 {
 	"type": "filament",
-	"name": "Blocks TPU @base",
+	"name": "Generic TPU @Blocks",
 	"inherits": "fdm_filament_tpu",
+	"renamed_from": "Blocks Generic TPU",
 	"from": "system",
-	"filament_id": "OFYnedOZ",
-	"instantiation": "false",
-	"filament_vendor": [
-		"Blocks"
-	],
+	"setting_id": "6iVYOCZo8ugs4JA0",
+	"filament_id": "OFgbpcy9",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"4"
 	],
@@ -55,5 +54,18 @@
 	],
 	"during_print_exhaust_fan_speed": [
 		"80"
+	],
+	"compatible_printers": [
+		"BLOCKS Pro S100 0.4 nozzle",
+		"BLOCKS Pro S100 0.6 nozzle",
+		"BLOCKS Pro S100 0.8 nozzle",
+		"BLOCKS Pro S100 1.0 nozzle",
+		"BLOCKS Pro S100 1.2 nozzle",
+		"BLOCKS RD50 V2 0.4 nozzle",
+		"BLOCKS RD50 V2 0.6 nozzle",
+		"BLOCKS RD50 V2 0.8 nozzle",
+		"BLOCKS RF50 0.4 nozzle",
+		"BLOCKS RF50 0.6 nozzle",
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
@@ -6,7 +6,7 @@
 	"setting_id": "G7HQgaspHXduDM8O",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100",
+	"default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks",
 	"max_layer_height": [
 		"0.30"
 	],
@@ -25,8 +25,5 @@
 	"printable_height": "900",
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
-	],
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_Pro_S100"
 	]
 }
@@ -6,7 +6,7 @@
 	"setting_id": "XkWdS210oUMQN17N",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100",
+	"default_print_profile": "0.30mm Standard 0.6 nozzle @Blocks",
 	"max_layer_height": [
 		"0.50"
 	],
@@ -26,8 +26,5 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "0.6",
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_Pro_S100"
-	]
+	"printer_variant": "0.6"
 }
@@ -6,7 +6,7 @@
 	"setting_id": "I6PdeCS7SbvIlkZf",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100",
+	"default_print_profile": "0.40mm Standard 0.8 nozzle @Blocks",
 	"max_layer_height": [
 		"0.56"
 	],
@@ -26,8 +26,5 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "0.8",
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_Pro_S100"
-	]
+	"printer_variant": "0.8"
 }
@@ -6,7 +6,7 @@
 	"setting_id": "elLdUyy9RhUoa37o",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100",
+	"default_print_profile": "0.50mm Standard 1.0 nozzle @Blocks",
 	"max_layer_height": [
 		"0.7"
 	],
@@ -26,8 +26,5 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "1.0",
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_Pro_S100"
-	]
+	"printer_variant": "1.0"
 }
@@ -6,7 +6,7 @@
 	"setting_id": "xtsGSJ4JkbHTPi44",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100",
+	"default_print_profile": "0.60mm Standard 1.2 nozzle @Blocks",
 	"max_layer_height": [
 		"0.8"
 	],
@@ -26,8 +26,5 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "1.2",
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_Pro_S100"
-	]
+	"printer_variant": "1.2"
 }
@@ -8,5 +8,5 @@
 	"bed_model": "PRO S100 HotBed model.stl",
 	"bed_texture": "PRO S100 HotBed texture.svg",
 	"hotend_model": "BLOCKS PrintCore.stl",
-	"default_materials": "Blocks PLA @Blocks_Pro_S100;Blocks PETG @Blocks_Pro_S100;Blocks TPU @Blocks_Pro_S100"
+	"default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks"
 }
@@ -34,9 +34,5 @@
 	"printable_height": "500",
 	"upward_compatible_machine": [
 		"BLOCKS RD50 V2"
-	],
-	"printer_variant": "0.4",
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_RD50_V2"
 	]
 }
@@ -35,8 +35,5 @@
 	"deretraction_speed": [
 		"80"
 	],
-	"printer_variant": "0.6",
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_RD50_V2"
-	]
+	"printer_variant": "0.6"
 }
@@ -35,8 +35,5 @@
 	"deretraction_speed": [
 		"80"
 	],
-	"printer_variant": "0.8",
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_RD50_V2"
-	]
+	"printer_variant": "0.8"
 }
@@ -8,5 +8,5 @@
 	"bed_model": "RD50 V2 HotBed model.stl",
 	"bed_texture": "RD50 V2 HotBed texture.svg",
 	"hotend_model": "BLOCKS PrintCore.stl",
-	"default_materials": "Blocks PLA @Blocks_RD50_V2;Blocks PETG @Blocks_RD50_V2;Blocks TPU @Blocks_RD50_V2"
+	"default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks"
 }
@@ -51,7 +51,7 @@
 		"12"
 	],
 	"retraction_length": [
-		"1.2"
+		"1"
 	],
 	"retraction_speed": [
 		"60"
@@ -79,10 +79,5 @@
 	],
 	"retract_before_wipe": [
 		"0"
-	],
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_RF50"
-	],
-	"support_multi_bed_types": "1",
-	"default_bed_type": "Textured PEI Plate"
+	]
 }
@@ -51,7 +51,7 @@
 		"12"
 	],
 	"retraction_length": [
-		"1.2"
+		"1"
 	],
 	"retraction_speed": [
 		"60"
@@ -75,8 +75,8 @@
 		"BLOCKS RF50"
 	],
 	"machine_start_gcode": [
-		"PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]\n",
-		"SET_PRESSURE_ADVANCE ADVANCE=0.046\n"
+		"PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]",
+		"SET_PRESSURE_ADVANCE ADVANCE=0.046"
 	],
 	"printer_variant": "0.6",
 	"wipe_distance": [
@@ -84,10 +84,5 @@
 	],
 	"retract_before_wipe": [
 		"0"
-	],
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_RF50"
-	],
-	"support_multi_bed_types": "1",
-	"default_bed_type": "Textured PEI Plate"
+	]
 }
@@ -51,7 +51,7 @@
 		"12"
 	],
 	"retraction_length": [
-		"1.2"
+		"1"
 	],
 	"retraction_speed": [
 		"60"
@@ -80,10 +80,5 @@
 	],
 	"retract_before_wipe": [
 		"0"
-	],
-	"default_filament_profile": [
-		"Blocks PLA @Blocks_RF50"
-	],
-	"support_multi_bed_types": "1",
-	"default_bed_type": "Textured PEI Plate"
+	]
 }
@@ -8,6 +8,5 @@
 	"bed_model": "RF50 HotBed model.stl",
 	"bed_texture": "RF50 HotBed texture.svg",
 	"hotend_model": "BLOCKS PrintCore.stl",
-	"default_materials": "Blocks PLA @Blocks_RF50;Blocks PETG @Blocks_RF50;Blocks TPU @Blocks_RF50",
-	"not_support_bed_type": "Smooth Cool Plate;Engineering Plate;Textured Cool Plate;Cool Plate (SuperTack)"
+	"default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks"
 }
@@ -123,6 +123,9 @@
 	"wipe": [
 		"1"
 	],
+	"default_filament_profile": [
+		"Generic PLA @Blocks"
+	],
 	"bed_exclude_area": [
 		"0x0"
 	],
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100",
+	"name": "0.20mm Standard 0.4 nozzle @Blocks",
 	"inherits": "fdm_process_blocks_common",
 	"from": "system",
-	"setting_id": "QSEguMMChNFZsK5H",
+	"setting_id": "47aDtVL6E5DVr7Mt",
 	"instantiation": "true",
 	"layer_height": "0.2",
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "5",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.4 nozzle"
-	],
-	"renamed_from": "0.20mm Standard 0.4 nozzle @Blocks"
+	]
 }
@@ -25,7 +25,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -61,7 +61,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.24mm Draft 0.4 nozzle @Blocks_Pro_S100",
+	"name": "0.24mm Draft 0.4 nozzle @Blocks",
 	"inherits": "fdm_process_blocks_common",
 	"from": "system",
-	"setting_id": "uALfEFHGmup6vBYI",
+	"setting_id": "ETADjxV6ViJQdnHA",
 	"instantiation": "true",
 	"layer_height": "0.24",
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "5",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.4 nozzle"
-	],
-	"renamed_from": "0.24mm Draft 0.4 nozzle @Blocks"
+	]
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -22,7 +22,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100",
+	"name": "0.30mm Extra Draft 0.4 nozzle @Blocks",
 	"inherits": "fdm_process_blocks_common",
 	"from": "system",
-	"setting_id": "HYKF5l2OGvpugSQy",
+	"setting_id": "UbuICsmppKDsaaZ4",
 	"instantiation": "true",
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "4",
 	"layer_height": "0.30",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.4 nozzle"
-	],
-	"renamed_from": "0.30mm Extra Draft 0.4 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100",
+	"name": "0.30mm Optimal 0.8 nozzle @Blocks",
 	"inherits": "fdm_process_common 0.8 nozzle",
 	"from": "system",
-	"setting_id": "OUfZvizM5MGnvHfp",
+	"setting_id": "YqkYzp5zdH4R5upm",
 	"instantiation": "true",
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "3",
 	"layer_height": "0.3",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.8 nozzle"
-	],
-	"renamed_from": "0.30mm Optimal 0.8 nozzle @Blocks"
+	]
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100",
+	"name": "0.30mm Optimal 1.0 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "HGG9WxKVr89qNFDx",
+	"setting_id": "8pBawPScHkyQu0SW",
 	"instantiation": "true",
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "4",
 	"layer_height": "0.30",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.0 nozzle"
-	],
-	"renamed_from": "0.30mm Optimal 1.0 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100",
+	"name": "0.30mm Standard 0.6 nozzle @Blocks",
 	"inherits": "fdm_process_common 0.6 nozzle",
 	"from": "system",
-	"setting_id": "gO2I1YjBl4nf8yzr",
+	"setting_id": "EPI3PAVK9LpJOZWO",
 	"instantiation": "true",
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "3",
 	"layer_height": "0.30",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.6 nozzle"
-	],
-	"renamed_from": "0.30mm Standard 0.6 nozzle @Blocks"
+	]
 }
@@ -22,7 +22,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -22,7 +22,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.40mm Draft 0.6 nozzle @Blocks_Pro_S100",
+	"name": "0.40mm Draft 0.6 nozzle @Blocks",
 	"inherits": "fdm_process_common 0.6 nozzle",
 	"from": "system",
-	"setting_id": "OjsLUl1heqv1cevs",
+	"setting_id": "CShVKoGspbMJNPw8",
 	"instantiation": "true",
 	"bottom_shell_layers": "2",
 	"top_shell_layers": "2",
 	"layer_height": "0.40",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.6 nozzle"
-	],
-	"renamed_from": "0.40mm Draft 0.6 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100",
+	"name": "0.40mm Standard 0.8 nozzle @Blocks",
 	"inherits": "fdm_process_common 0.8 nozzle",
 	"from": "system",
-	"setting_id": "laOTioBGySeudJpl",
+	"setting_id": "TSRjmfWaatY7oLJB",
 	"instantiation": "true",
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "4",
 	"layer_height": "0.40",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.8 nozzle"
-	],
-	"renamed_from": "0.40mm Standard 0.8 nozzle @Blocks"
+	]
 }
@@ -22,7 +22,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.50mm Draft 0.8 nozzle @Blocks_Pro_S100",
+	"name": "0.50mm Draft 0.8 nozzle @Blocks",
 	"inherits": "fdm_process_common 0.8 nozzle",
 	"from": "system",
-	"setting_id": "oAhgUZdADR7kP87e",
+	"setting_id": "vOtZHrDS88Shmf2m",
 	"instantiation": "true",
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "4",
 	"layer_height": "0.50",
 	"compatible_printers": [
 		"BLOCKS Pro S100 0.8 nozzle"
-	],
-	"renamed_from": "0.50mm Draft 0.8 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100",
+	"name": "0.50mm Optimal 1.2 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "0eqNgX26jemsBfV5",
+	"setting_id": "BKrEAKqDYzdH43wc",
 	"instantiation": "true",
 	"bottom_shell_layers": "2",
 	"top_shell_layers": "3",
 	"layer_height": "0.50",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.2 nozzle"
-	],
-	"renamed_from": "0.50mm Optimal 1.2 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100",
+	"name": "0.50mm Standard 1.0 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "z1qCW1cEMc4QvBbV",
+	"setting_id": "D40iksDm7mFjhSKn",
 	"instantiation": "true",
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "3",
 	"layer_height": "0.50",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.0 nozzle"
-	],
-	"renamed_from": "0.50mm Standard 1.0 nozzle @Blocks"
+	]
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_pattern": "grid",
+	"sparse_infill_patter": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,7 +57,5 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1",
-	"skirt_loops": "2",
-	"skirt_type": "perobject"
+	"elefant_foot_compensation_layers": "1"
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.60mm Draft 1.0 nozzle @Blocks_Pro_S100",
+	"name": "0.60mm Draft 1.0 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "gTTgtfG8qb9My3hH",
+	"setting_id": "UJUe8XCBzZf8NyCL",
 	"instantiation": "true",
 	"bottom_shell_layers": "2",
 	"top_shell_layers": "3",
 	"layer_height": "0.60",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.0 nozzle"
-	],
-	"renamed_from": "0.60mm Draft 1.0 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100",
+	"name": "0.60mm Standard 1.2 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "ApcyToENCIANrI71",
+	"setting_id": "PSBFrTykpkytPI2Q",
 	"instantiation": "true",
 	"bottom_shell_layers": "2",
 	"top_shell_layers": "3",
 	"layer_height": "0.60",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.2 nozzle"
-	],
-	"renamed_from": "0.60mm Standard 1.2 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.70mm Draft 1.2 nozzle @Blocks_Pro_S100",
+	"name": "0.70mm Draft 1.2 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "DEv7X7zaTfxRQmjo",
+	"setting_id": "0ZQ0USGX9SwAKr29",
 	"instantiation": "true",
 	"bottom_shell_layers": "2",
 	"top_shell_layers": "3",
 	"layer_height": "0.70",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.2 nozzle"
-	],
-	"renamed_from": "0.70mm Draft 1.2 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100",
+	"name": "0.70mm Extra Draft 1.0 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "nUW7N9dJmTyQT4AG",
+	"setting_id": "69PFmjOVFBOIp3Qg",
 	"instantiation": "true",
 	"bottom_shell_layers": "2",
 	"top_shell_layers": "3",
 	"layer_height": "0.70",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.0 nozzle"
-	],
-	"renamed_from": "0.70mm Extra Draft 1.0 nozzle @Blocks"
+	]
 }
@@ -1,15 +1,14 @@
 {
 	"type": "process",
-	"name": "0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100",
+	"name": "0.80mm Extra Draft 1.2 nozzle @Blocks",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "JMy62SonRfK0cAdL",
+	"setting_id": "iBwRI5JJewW5HJSv",
 	"instantiation": "true",
 	"bottom_shell_layers": "2",
 	"top_shell_layers": "2",
 	"layer_height": "0.80",
 	"compatible_printers": [
 		"BLOCKS Pro S100 1.2 nozzle"
-	],
-	"renamed_from": "0.80mm Extra Draft 1.2 nozzle @Blocks"
+	]
 }
@@ -1,6 +1,6 @@
 {
 	"name": "OrcaFilamentLibrary",
-	"version": "02.04.00.13",
+	"version": "02.04.00.12",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [
@@ -6,7 +6,7 @@
 	"filament_id": "OFvgE0Zh",
 	"instantiation": "false",
 	"fan_cooling_layer_time": [
-		"81"
+		"80"
 	],
 	"fan_min_speed": [
 		"50"
@@ -2673,10 +2673,10 @@ void CadDocument::apply_feature(TopoDS_Shape& result, bool& have_body,
                ridge = pipe.Shape();
                have_ridge = !ridge.IsNull();
            }
-        } catch (const Standard_Failure&) {
-            have_ridge = false; // OCCT failure — on OCCT >= 8 Standard_Failure derives from std::exception, so this handler must come first
        } catch (const std::exception&) {
            have_ridge = false; // fall back to the bare cylinder/bore below
+        } catch (const Standard_Failure&) {
+            have_ridge = false; // OCCT failure (not a std::exception) — must be caught here too
        }

        if (f.thread_internal) {
@@ -15,8 +15,6 @@
 #include <TopExp.hxx>
 #include <TopTools.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <Poly_Triangulation.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
@@ -25,7 +25,6 @@
 #include "XCAFDoc_DocumentTool.hxx"
 #include "XCAFDoc_ShapeTool.hxx"
 #include "XCAFApp_Application.hxx"
-#include "TDF_LabelSequence.hxx"
 #include "TopoDS_Solid.hxx"
 #include "TopoDS_Compound.hxx"
 #include "TopoDS_Builder.hxx"
@@ -7969,20 +7969,6 @@ double GCode::calc_max_volumetric_speed(const double layer_height, const double
    return res;
 }

-// ORCA: Overlap at or below which the overhang fan switches on; negative when it does not depend on overlap
-// (Overhang_threshold_none cools every external perimeter).
-static float overhang_fan_overlap_threshold(int overhang_fan_threshold)
-{
-    switch (overhang_fan_threshold) {
-    case (int) Overhang_threshold_1_4: return 0.9f;
-    case (int) Overhang_threshold_2_4: return 0.75f;
-    case (int) Overhang_threshold_3_4: return 0.5f;
-    case (int) Overhang_threshold_4_4: return 0.25f;
-    case (int) Overhang_threshold_bridge: return 0.05f;
-    default: return -1.f;
-    }
-}
-
 std::string GCode::_extrude(const ExtrusionPath &path, std::string description, double speed)
 {
    std::string gcode;
@@ -8325,13 +8311,6 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
            
            ConfigOptionPercents         overhang_overlap_levels({90, 75, 50, 25, 13, 0});

-            // ORCA: Lets the path be split where the overhang fan switches, not only where the speed changes.
-            // Bridges and overhang perimeters are cooled regardless of overlap.
-            float fan_overlap_threshold = -1.f;
-            if (FILAMENT_CONFIG(enable_overhang_bridge_fan) && m_enable_cooling_markers && path.role() != erBridgeInfill &&
-                path.role() != erOverhangPerimeter)
-                fan_overlap_threshold = overhang_fan_overlap_threshold(FILAMENT_CONFIG(overhang_fan_threshold));
-
            if (NOZZLE_CONFIG(slowdown_for_curled_perimeters)){
                ConfigOptionFloatsOrPercents dynamic_overhang_speeds(
                    {FloatOrPercent{100, true},
@@ -8352,8 +8331,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
                         FloatOrPercent{NOZZLE_CONFIG(overhang_4_4_speed).get_abs_value(ref_speed) * 100 / ref_speed, true}});

                new_points = m_extrusion_quality_estimator.estimate_extrusion_quality(path, overhang_overlap_levels, dynamic_overhang_speeds,
-                                                                              ref_speed, speed, NOZZLE_CONFIG(slowdown_for_curled_perimeters),
-                                                                              fan_overlap_threshold);
+                                                                              ref_speed, speed, NOZZLE_CONFIG(slowdown_for_curled_perimeters));
        	}else{
                ConfigOptionFloatsOrPercents dynamic_overhang_speeds(
                                                                     {FloatOrPercent{100, true},
@@ -8372,8 +8350,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
                     FloatOrPercent{NOZZLE_CONFIG(bridge_speed) * 100 / ref_speed, true}});

                new_points = m_extrusion_quality_estimator.estimate_extrusion_quality(path, overhang_overlap_levels, dynamic_overhang_speeds,
-                                                                              ref_speed, speed, NOZZLE_CONFIG(slowdown_for_curled_perimeters),
-                                                                              fan_overlap_threshold);
+                                                                              ref_speed, speed, NOZZLE_CONFIG(slowdown_for_curled_perimeters));
            }
            variable_speed = std::any_of(new_points.begin(), new_points.end(),
                                         [speed](const ProcessedPoint &p) { return fabs(double(p.speed) - speed) > 1; }); // Ignore small speed variations (under 1mm/sec)
@@ -8525,10 +8502,28 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
      if (role == erBridgeInfill || role == erOverhangPerimeter) { // ORCA: Split out bridge infill to internal and external to apply separate fan settings
        return true;
      }
-      if (overhang_fan_threshold == Overhang_threshold_none)
+      switch (overhang_fan_threshold) {
+      case (int)Overhang_threshold_1_4:
+        return overlap <= 0.9f;
+        break;
+      case (int)Overhang_threshold_2_4:
+        return overlap <= 0.75f;
+        break;
+      case (int)Overhang_threshold_3_4:
+        return overlap <= 0.5f;
+        break;
+      case (int)Overhang_threshold_4_4:
+        return overlap <= 0.25f;
+        break;
+      case (int)Overhang_threshold_bridge:
+        return overlap <= 0.05f;
+        break;
+      case (int)Overhang_threshold_none:
        return is_external_perimeter(role);
-      const float overlap_threshold = overhang_fan_overlap_threshold(overhang_fan_threshold);
-      return overlap_threshold >= 0.f && overlap <= overlap_threshold;
+        break;
+      default:
+        return false;
+      }
    };

    std::string comment;
@@ -41,12 +41,10 @@ std::vector<ExtendedPoint<L::Dim>> estimate_points_properties(const POINTS&
                                                              float                                   flow_width,
                                                              float                                   max_line_length = -1.0f,
                                                              float                                   min_distance    = -1.0f,
-                                                              // Speed an overhang distance prints at. Without it, interior sampling
-                                                              // is skipped and every line over 4mm is split.
-                                                              const std::function<float(float)>&      distance_to_speed = {},
-                                                              // Overlap (1 - distance / flow_width) at or below which the overhang
-                                                              // fan switches on; negative when the fan does not depend on overlap.
-                                                              float                                   fan_overlap_threshold = -1.0f)
+                                                              // Maps an overhang distance onto the speed it will be printed at. Interior sampling
+                                                              // needs it to tell which of the points it could add would change the G-code, and is
+                                                              // skipped without it.
+                                                              const std::function<float(float)>&      distance_to_speed = {})
 {
    bool   looped     = input_points.front() == input_points.back();
    std::function<size_t(size_t,size_t)> get_prev_index = [](size_t idx, size_t count) {
@@ -127,43 +125,29 @@ std::vector<ExtendedPoint<L::Dim>> estimate_points_properties(const POINTS&
        points.push_back(next_point);
    }

-    // ORCA: How an overhang distance prints, which is what the passes below compare. A segment is printed at the lower
-    // of the speeds at its two ends, and with the overhang fan on if the overlap at either end turns it on. A point
-    // added to a path can therefore only change the G-code where it prints at a different speed or fan state from the
-    // points either side of it, and the passes below add points there and nowhere else.
-    const float width_inv = 1.f / flow_width;
-    // Whether an overhang distance turns the overhang fan on. The overlap test check_overhang_fan applies in GCode.cpp.
-    auto fan_on = [fan_overlap_threshold, width_inv](float distance) {
-        return fan_overlap_threshold >= 0.f && 1.f - distance * width_inv <= fan_overlap_threshold;
-    };
-    // Whether two overhang distances are interchangeable ie have the same speed (beyond a 1mm/sec threshold that gcode.cpp filters out on) 
-    // and the same fan state.
-    auto same_speed_and_fan = [&distance_to_speed, &fan_on](float a, float b) {
-        return std::abs(distance_to_speed(a) - distance_to_speed(b)) <= 1.f && fan_on(a) == fan_on(b);
-    };
-    // Whether the first overhang distance prints slower than the second, beyond the 1mm/sec gcode.cpp tolerance, or turns the overhang
-    // fan on where the second does not. Against a supported point (overhang distance 0) it tells whether an end is
-    // affected by the overhang.
-    auto slower_or_cooled = [&distance_to_speed, &fan_on](float a, float b) {
-        return distance_to_speed(a) < distance_to_speed(b) - 1.f || (fan_on(a) && !fan_on(b));
-    };
-
    // ORCA: Interior sampling
-    // The passes below infer the support under a span from its endpoints alone, so a part that is supported
-    // differently from both ends is invisible to them. The outer perimeter of an overhang whose ends are supported by
-    // reads as supported along its whole length. Probe the interior, keep the samples the endpoint interpolation fails to predict, 
-    // and bisect either side of each one, so a span that is only partly unsupported gets points where its support actually changes 
-    // instead of one reading being spread across all of it.
-    // Skipped where there is nothing to find: min_distance <= 0 when no overhang can slow this path down, and
-    // fan_overlap_threshold < 0 when no overhang switches the fan on. It also needs distance_to_speed to tell which of
-    // the points it could add would change the G-code.
-    if (PREV_LAYER_BOUNDARY_OFFSET && ADD_INTERSECTIONS && distance_to_speed && (min_distance > 0 || fan_overlap_threshold >= 0.f)) {
+    // The passes below infer the support under a span from its endpoints alone, so an interior that is supported
+    // differently from both ends is invisible to them: the outer perimeter of an overhang whose ends are caged by
+    // full height walls reads as supported along its whole length. Probe the interior, keep the samples the
+    // endpoint interpolation fails to predict, and bisect either side of each one, so a span that is only partly
+    // unsupported gets points where its support actually changes instead of one reading spread across all of it.
+    if (PREV_LAYER_BOUNDARY_OFFSET && ADD_INTERSECTIONS && min_distance > 0 && distance_to_speed) {
        // Probe at least this densely before treating matching samples as evidence that a span is uniform. The
        // segmentation pass below only splits lines of 2mm or more, and every pass here drops points closer
-        // together than min_spacing, so finer discovery would not produce a more precise transition.
+        // together than min_spacing, so finer discovery would not produce a more precise speed transition.
        const double max_probe_spacing = std::max(2., 4. * min_spacing);
        // A backstop for that length test, which on a non-finite length would never be met.
        constexpr int max_bisection_depth = 10;
+        // Whether two readings are interchangeable. A segment is printed at the lower of the speeds its ends
+        // read, so a sample that agrees on speed with what is already known cannot change the G-code, whatever
+        // its distance says. The distances themselves are far too coarse a stand-in for this: the speed sections
+        // interpolate, so readings a small fraction of min_distance apart can still be tens of mm/s apart.
+        // The tolerance matches the one GCode.cpp applies when it decides a path has a variable speed at all.
+        auto same_speed = [&distance_to_speed](float a, float b) {
+            return std::abs(distance_to_speed(a) - distance_to_speed(b)) <= 1.f;
+        };
+        // Whether the first reading is printed slower than the second, once they are known to differ.
+        auto prints_slower = [&distance_to_speed](float a, float b) { return distance_to_speed(a) < distance_to_speed(b); };

        // Part of a segment still to bisect: its positions along the segment and bisections left.
        struct Subspan { double t0, t1; int depth; };
@@ -201,8 +185,8 @@ std::vector<ExtendedPoint<L::Dim>> estimate_points_properties(const POINTS&
            if (!interior.empty()) {
                std::sort(interior.begin(), interior.end(),
                          [](const std::pair<double, float>& l, const std::pair<double, float>& r) { return l.first < r.first; });
-                // Coarse probing keeps every sample it took until this pass can see which ones bracket a speed or
-                // fan transition. Matching samples cannot be discarded during discovery: one may be the last
+                // Coarse probing keeps every sample it took until this pass can see which ones bracket a speed
+                // transition. Matching samples cannot be discarded during discovery: one may be the last
                // supported point before a narrow unsupported pocket found by a later probe.
                size_t kept = 0;
                for (size_t i = 0; i < interior.size(); ++i) {
@@ -211,15 +195,15 @@ std::vector<ExtendedPoint<L::Dim>> estimate_points_properties(const POINTS&
                    const bool  at_end    = i + 1 == interior.size();      // And nothing follows the last sample but the segment's end
                    const float before    = at_start ? curr.distance : interior[kept - 1].second;
                    const float after     = at_end ? next.distance : interior[i + 1].second;
-                    // A sample is worth a point in the path only where it prints differently, in speed or fan state,
-                    // from the points either side of it. Differing from one of the segment's own ends is not enough on
-                    // its own where the sample is not the slower or cooled of the two: the segmentation pass below
-                    // already confines the slowdown and cooling at an end, at a distance taken from how far out that
-                    // end is rather than from wherever bisection happened to stop, and a point here would leave the
-                    // span beside the end too short for that pass to run at all. Support an end cannot account for,
-                    // where the interior is the slower or cooled of the two, is exactly what this pass is here to find.
-                    const bool worth_before = !same_speed_and_fan(sample, before) && (!at_start || slower_or_cooled(sample, before));
-                    const bool worth_after  = !same_speed_and_fan(sample, after) && (!at_end || slower_or_cooled(sample, after));
+                    // A sample is worth a point in the path only where it prints at a different speed from the
+                    // readings either side of it. Differing from one of the segment's own ends is not enough on
+                    // its own where the sample is the faster of the two: the segmentation pass below already
+                    // ends the slowdown an end reads, at a distance taken from how far out that end is rather
+                    // than from wherever bisection happened to stop, and a point here would leave the span
+                    // beside the end too short for that pass to run at all. Support an end cannot account for,
+                    // where the interior is the slower reading, is exactly what this pass is here to find.
+                    const bool worth_before = !same_speed(sample, before) && (!at_start || prints_slower(sample, before));
+                    const bool worth_after  = !same_speed(sample, after) && (!at_end || prints_slower(sample, after));
                    if (worth_before || worth_after)
                        interior[kept++] = interior[i];
                }
@@ -254,60 +238,52 @@ std::vector<ExtendedPoint<L::Dim>> estimate_points_properties(const POINTS&
            if ((curr.distance > -boundary_offset && curr.distance < boundary_offset + 2.0f) ||
                (next.distance > -boundary_offset && next.distance < boundary_offset + 2.0f)) {
                double line_len = (next.position - curr.position).norm();
-
-                // ORCA: A line prints as slow as its slower end and is cooled if either end is, so an overhang at one
-                // end would otherwise slow down or cool the whole line. Split the line so that only the part beside
-                // that end prints that way, if the line is reasonably long (2mm or more) and at least one end prints
-                // slower or cooled compared with a supported point (overhang distance 0). Deciding on how the end
-                // prints, rather than on its overhang distance against min_distance, also catches an end whose overhang
-                // distance is exactly where the slowdown begins, such as an outline crossing at half a line width.
-                // Without distance_to_speed, split every line over 4mm.
-                const bool split_line = distance_to_speed ?
-                    line_len >= 2.f && (slower_or_cooled(curr.distance, 0.f) || slower_or_cooled(next.distance, 0.f)) :
-                    line_len > 4.0f;
-                if (split_line) {
-                    // Each end's piece is that end's overhang distance plus 1.5 line widths (3 * boundary_offset) long:
-                    // a0 ends the piece beside curr, a1 starts the piece beside next.
+                
+                // ORCA: Segment path to smaller lines by adding additional points only if the path has an overhang that
+                // will trigger a slowdown and the path is also reasonably large, i.e. 2mm in length or more
+                // If there is no overhang in the start/end point, dont segment it.
+                // Ignore this check if the control of segmentation for overhangs is disabled (min_distance=-1)
+                if ((min_distance > 0 && ((std::abs(curr.distance) > min_distance) || (std::abs(next.distance) > min_distance)) && line_len >= 2.f) ||
+                    (min_distance <= 0 && line_len > 4.0f)) {
                    double a0 = std::clamp((curr.distance + 3 * boundary_offset) / line_len, 0.0, 1.0);
                    double a1 = std::clamp(1.0f - (next.distance + 3 * boundary_offset) / line_len, 0.0, 1.0);
                    double t0 = std::min(a0, a1);
                    double t1 = std::max(a0, a1);

-                    // Up to two cut points, in order along the line. Each takes its own overhang distance, so every
-                    // piece prints by the overhang distances at its own two ends. t0 >= 1 or t1 <= 0 falls on the
-                    // line's own end, so there is no cut. A cut closer than min_spacing to either end of the line is
-                    // not meaningful and is filtered out (#6714).
-                    ExtendedPoint<L::Dim> cut[2]{};
-                    bool                  keep[2] = {false, false};
-                    for (int k = 0; k < 2; ++k) {
-                        const double t = k == 0 ? t0 : t1;
-                        if (k == 0 ? t >= 1.0 : t <= 0.0)
-                            continue;
-                        const Vec p                  = curr.position + t * (next.position - curr.position);
-                        auto [p_dist, p_near_l, p_x] = unscaled_prev_layer.template distance_from_lines_extra<SIGNED_DISTANCE>(
-                            p.template cast<AABBScalar>());
-                        cut[k].position = p;
-                        cut[k].distance = float(p_dist + boundary_offset);
-                        keep[k] = (p - curr.position).norm() > min_spacing && (next.position - p).norm() > min_spacing;
+                    if (t0 < 1.0) {
+                        Vec p0                          = curr.position + t0 * (next.position - curr.position);
+                        auto [p0_dist, p0_near_l, p0_x] = unscaled_prev_layer.template distance_from_lines_extra<SIGNED_DISTANCE>(
+                            p0.template cast<AABBScalar>());
+                        ExtendedPoint<L::Dim> new_p{};
+                        new_p.position = p0;
+                        new_p.distance = float(p0_dist + boundary_offset);
+                        // ORCA: only create a new point in the path if the new point overhang distance will be used to generate a speed change
+                        // or if this option is disabled (min_distance<=0)
+                        if( (std::abs(p0_dist) > min_distance) || (min_distance<=0)){
+                            // ORCA: also filter out points that are introduced to the start of the path when their distance from the start point is
+                            // not meaningful
+                            if ((p0 - curr.position).norm() > min_spacing && (next.position - p0).norm() > min_spacing) {
+                                new_points.push_back(new_p);
+                            }
+                        }
                    }
-                    if (distance_to_speed) {
-                        // Only keep a cut that changes the G-code: one that prints differently from at least one of the
-                        // points either side of it, which are the line's ends or the other cut where that is kept. A cut
-                        // that prints like both would only split a move into two identical ones.
-                        if (keep[0])
-                            keep[0] = !same_speed_and_fan(cut[0].distance, curr.distance) ||
-                                      !same_speed_and_fan(cut[0].distance, keep[1] ? cut[1].distance : next.distance);
-                        if (keep[1])
-                            keep[1] = !same_speed_and_fan(cut[1].distance, keep[0] ? cut[0].distance : curr.distance) ||
-                                      !same_speed_and_fan(cut[1].distance, next.distance);
-                        // Two cuts closer together than min_spacing would leave a micro segment between them, so only the
-                        // first is kept.
-                        if (keep[0] && keep[1] && (cut[1].position - cut[0].position).norm() <= min_spacing)
-                            keep[1] = false;
+                    if (t1 > 0.0) {
+                        Vec p1                          = curr.position + t1 * (next.position - curr.position);
+                        auto [p1_dist, p1_near_l, p1_x] = unscaled_prev_layer.template distance_from_lines_extra<SIGNED_DISTANCE>(
+                            p1.template cast<AABBScalar>());
+                        ExtendedPoint<L::Dim> new_p{};
+                        new_p.position = p1;
+                        new_p.distance = float(p1_dist + boundary_offset);
+                        // ORCA: only create a new point in the path if the new point overhang distance will be used to generate a speed change
+                        // or if this option is disabled (min_distance<=0)
+                        if( (std::abs(p1_dist) > min_distance) || (min_distance<=0)){
+                            // ORCA: filter out points that are introduced to the end of the path when their distance from the end point is
+                            // not meaningful
+                            if ((p1 - curr.position).norm() > min_spacing && (next.position - p1).norm() > min_spacing) {
+                                new_points.push_back(new_p);
+                            }
+                        }
                    }
-                    for (int k = 0; k < 2; ++k)
-                        if (keep[k])
-                            new_points.push_back(cut[k]);
                }
            }
            new_points.push_back(next);
@@ -447,10 +423,7 @@ public:
                                                           const ConfigOptionFloatsOrPercents &speeds,
                                                           float                               ext_perimeter_speed,
                                                           float                               original_speed,
-                                                           bool								   slowdown_for_curled_edges,
-                                                           // Overlap at or below which the overhang fan switches on; negative when the fan
-                                                           // does not depend on overlap.
-                                                           float                               fan_overlap_threshold = -1.0f)
+                                                           bool								   slowdown_for_curled_edges)
    {
        size_t                               speed_sections_count = std::min(overlaps.values.size(), speeds.values.size());
        std::vector<std::pair<float, float>> speed_sections;
@@ -490,8 +463,7 @@ public:
            }
        }

-        // If no overhang distance slows this path down, -1 turns interior sampling off unless the overhang fan can switch.
-        // Lines are only split where an end prints slower or cooled, so here only a fan switch splits them.
+        // If a meaningful (i.e. needing slowdown) overhang distance was not found, then we shouldn't split the lines
        if (!found)
            smallest_distance_with_lower_speed=-1.f;

@@ -515,17 +487,9 @@ public:
            return round(final_speed);
        };

-        // ORCA: The speed sections are built from ext_perimeter_speed, which can be above the speed this path prints at
-        // (original_speed, e.g. held down by resonance avoidance). Every segment is capped at original_speed below, so
-        // overhang distances whose speeds differ only above it print the same and must not count as a speed change when
-        // the path is split.
-        auto effective_speed = [&calculate_speed, original_speed](float distance) {
-            return std::min(calculate_speed(distance), original_speed);
-        };
-
        std::vector<ExtendedPoint<3>> extended_points =
            estimate_points_properties<true, true, true, true>(path.polyline.points, prev_layer_boundaries[current_object], path.width, -1,
-                                                               smallest_distance_with_lower_speed, effective_speed, fan_overlap_threshold);
+                                                               smallest_distance_with_lower_speed, calculate_speed);
        const auto width_inv = 1.0f / path.width;
        std::vector<ProcessedPoint> processed_points;
        processed_points.reserve(extended_points.size());
@@ -34,10 +34,6 @@ static const char* Segments_Vertex_Shader =
 // ORCA: 0 during the shadow caster pass - the bias below shifts eye_position but not
 // world_position, so the caster would write a depth the receiver never looks up.
 "uniform float bias_scale;\n"
-// draw the instances last to first, top layers before the ones they hide, so that early depth
-// rejection discards most of the hidden fragments; set when the camera looks down on the print
-"uniform int reverse_order;\n"
-"uniform int instance_count;\n"
 "in int vertex_id;\n"
 "out vec3 color;\n"
 "// ORCA: realistic view - the light the shadow map is able to block, kept apart from the\n"
@@ -63,8 +59,7 @@ static const char* Segments_Vertex_Shader =
 "  return top_diffuse + front_diffuse + top_specular;\n"
 "}\n"
 "void main() {\n"
-"  int instance = (reverse_order != 0) ? instance_count - 1 - gl_InstanceID : gl_InstanceID;\n"
-"  int id_a = int(texelFetch(segment_index_tex, instance).r);\n"
+"  int id_a = int(texelFetch(segment_index_tex, gl_InstanceID).r);\n"
 "  int id_b = id_a + 1;\n"
 "  vec3 pos_a = texelFetch(position_tex, id_a).xyz;\n"
 "  vec3 pos_b = texelFetch(position_tex, id_b).xyz;\n"
@@ -763,8 +763,6 @@ void ViewerImpl::init(const std::string& opengl_context_version)
    m_uni_segments_height_width_angle_tex_id = glGetUniformLocation(m_segments_shader_id, "height_width_angle_tex");
    m_uni_segments_colors_tex_id             = glGetUniformLocation(m_segments_shader_id, "color_tex");
    m_uni_segments_segment_index_tex_id      = glGetUniformLocation(m_segments_shader_id, "segment_index_tex");
-    m_uni_segments_reverse_order_id          = glGetUniformLocation(m_segments_shader_id, "reverse_order");
-    m_uni_segments_instance_count_id         = glGetUniformLocation(m_segments_shader_id, "instance_count");
    // ORCA: realistic view
    m_uni_segments_shadow_map_id             = glGetUniformLocation(m_segments_shader_id, "shadow_map");
    m_uni_segments_shadow_light_vp_id        = glGetUniformLocation(m_segments_shader_id, "shadow_light_vp");
@@ -2092,15 +2090,6 @@ void ViewerImpl::render_segments(const Mat4x4& view_matrix, const Mat4x4& projec
    glsafe(glUniformMatrix4fv(m_uni_segments_view_matrix_id, 1, GL_FALSE, view_matrix.data()));
    glsafe(glUniformMatrix4fv(m_uni_segments_projection_matrix_id, 1, GL_FALSE, projection_matrix.data()));
    glsafe(glUniform3fv(m_uni_segments_camera_position_id, 1, camera_position.data()));
-    // The segments come in print order, bottom layer first. Seen from above, that is back to front,
-    // and every hidden fragment is shaded before the one that covers it. Drawing them last to first
-    // lets the depth test reject the hidden ones instead. The camera looks down when the world's
-    // up axis points towards it, which is the view matrix's (2, 2) entry being positive.
-    const bool top_down = !m_rendering_shadow_casters && view_matrix[10] > 0.0f;
-    glsafe(glUniform1i(m_uni_segments_reverse_order_id, top_down ? 1 : 0));
-#ifndef ENABLE_OPENGL_ES
-    glsafe(glUniform1i(m_uni_segments_instance_count_id, static_cast<int>(m_enabled_segments_count)));
-#endif // ENABLE_OPENGL_ES
    // ORCA: realistic view. The depth pass writes the map it would otherwise read, so it shades
    // with the lookup off.
    glsafe(glUniform1i(m_uni_segments_shadow_map_id, m_shadow_map_texture_unit));
@@ -362,8 +362,6 @@ private:
    int m_uni_segments_height_width_angle_tex_id{ -1 };
    int m_uni_segments_colors_tex_id{ -1 };
    int m_uni_segments_segment_index_tex_id{ -1 };
-    int m_uni_segments_reverse_order_id{ -1 };
-    int m_uni_segments_instance_count_id{ -1 };
    int m_uni_segments_shadow_map_id{ -1 };
    int m_uni_segments_shadow_light_vp_id{ -1 };
    int m_uni_segments_shadow_intensity_id{ -1 };
@@ -4862,13 +4862,13 @@ void DesignPanel::on_import_mesh()
    try {
        shape = GeometryEngine::mesh_to_brep(mesh.its, MESH_IMPORT_TOLERANCE,
                                             MESH_IMPORT_MERGE_ANGLE_DEG, stats);
-    } catch (const Standard_Failure& e) {   // on OCCT >= 8 Standard_Failure derives from std::exception — must precede that handler
-        fail(_L("Mesh conversion failed: ") + wxString::FromUTF8(
-                 e.GetMessageString() ? e.GetMessageString() : "OCCT error"));
-        return;
    } catch (const std::exception& e) {
        fail(_L("Mesh conversion failed: ") + wxString::FromUTF8(e.what()));
        return;
+    } catch (const Standard_Failure& e) {   // OCCT throws outside std::exception
+        fail(_L("Mesh conversion failed: ") + wxString::FromUTF8(
+                 e.GetMessageString() ? e.GetMessageString() : "OCCT error"));
+        return;
    }
    if (shape.IsNull()) { fail(_L("Mesh conversion produced no geometry")); return; }

@@ -31,14 +31,15 @@ int UserManager::parse_json(std::string payload)
 {
    bool restored_json = false;
    json j;
-    json j_pre = json::parse(payload);
-    if (j_pre.empty()) {
-        return -1;
-    }

    //bind/unbind

    try {
+        json j_pre = json::parse(payload);
+        if (j_pre.empty()) {
+            return -1;
+        }
+
        if (j_pre.contains("bind")) {
            if (j_pre["bind"].contains("command")) {

@@ -274,13 +274,4 @@ bool Duet::start_print(wxString &msg, const std::string &filename, ConnectionTyp
 	return res;
 }

-int Duet::get_err_code_from_body(const std::string &body) const
-{
-	pt::ptree root;
-	std::istringstream iss (body); // wrap returned json to istringstream
-	pt::read_json(iss, root);
-
-	return root.get<int>("err", 0);
-}
-
 }
@@ -40,7 +40,6 @@ private:
 	ConnectionType connect(wxString &msg) const;
 	void disconnect(ConnectionType connectionType) const;
 	bool start_print(wxString &msg, const std::string &filename, ConnectionType connectionType, bool simulationMode) const;
-	int get_err_code_from_body(const std::string &body) const;
 };

 }
@@ -146,15 +146,6 @@ bool ESP3D::start_print(wxString& msg, const std::string& filename) const
    return ret;
 }

-int ESP3D::get_err_code_from_body(const std::string& body) const
-{
-    pt::ptree          root;
-    std::istringstream iss(body); // wrap returned json to istringstream
-    pt::read_json(iss, root);
-
-    return root.get<int>("err", 0);
-}
-
 // ESP3D only accepts 8.3 filenames else it crashes marlin and other undefined behaviour
 std::string ESP3D::get_short_name(const std::string& filename) const
 {
--- a/Show More
+++ b/Show More