test: bump elegoo profile to test OFL OTA E2E [TO BE REVERTED] (#15954 )

Merged by /bot merge on behalf of @peachismomo (id 52488812). Grants: resources/profiles/OrcaFilamentLibrary/filament/Elegoo, resources/profiles/OrcaFilamentLibrary.json, resources/profiles/Elegoo, resources/profiles/Elegoo.json Head: d4a18c633e
Catch Standard_Failure before std::exception (OCCT >= 8) (#15826 )
2026-09-28 11:21:30 +00:00 · 2026-09-28 10:47:41 +00:00 · 2026-09-28 13:44:32 +03:00 · 2026-09-28 13:42:25 +03:00 · 2026-09-28 10:59:39 +01:00 · 2026-09-28 17:16:55 +08:00
100 changed files with 1048 additions and 769 deletions
@@ -1,6 +1,6 @@
 {
 	"name": "Blocks",
-	"version": "02.04.00.04",
+	"version": "02.04.00.13",
 	"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",
+			"name": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks.json"
+			"sub_path": "process/0.20mm Standard 0.4 nozzle @Blocks_Pro_S100.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",
+			"name": "0.24mm Draft 0.4 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks.json"
+			"sub_path": "process/0.24mm Draft 0.4 nozzle @Blocks_Pro_S100.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",
+			"name": "0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Extra Draft 0.4 nozzle @Blocks.json"
+			"sub_path": "process/0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100.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",
+			"name": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Standard 0.6 nozzle @Blocks.json"
+			"sub_path": "process/0.30mm Standard 0.6 nozzle @Blocks_Pro_S100.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",
+			"name": "0.40mm Draft 0.6 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.40mm Draft 0.6 nozzle @Blocks.json"
+			"sub_path": "process/0.40mm Draft 0.6 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.30mm Optimal 0.8 nozzle @Blocks",
+			"name": "0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks.json"
+			"sub_path": "process/0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100.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",
+			"name": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.40mm Standard 0.8 nozzle @Blocks.json"
+			"sub_path": "process/0.40mm Standard 0.8 nozzle @Blocks_Pro_S100.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",
+			"name": "0.50mm Draft 0.8 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.50mm Draft 0.8 nozzle @Blocks.json"
+			"sub_path": "process/0.50mm Draft 0.8 nozzle @Blocks_Pro_S100.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",
+			"name": "0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.30mm Optimal 1.0 nozzle @Blocks.json"
+			"sub_path": "process/0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.50mm Standard 1.0 nozzle @Blocks",
+			"name": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.50mm Standard 1.0 nozzle @Blocks.json"
+			"sub_path": "process/0.50mm Standard 1.0 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.60mm Draft 1.0 nozzle @Blocks",
+			"name": "0.60mm Draft 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.60mm Draft 1.0 nozzle @Blocks.json"
+			"sub_path": "process/0.60mm Draft 1.0 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.70mm Extra Draft 1.0 nozzle @Blocks",
+			"name": "0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.70mm Extra Draft 1.0 nozzle @Blocks.json"
+			"sub_path": "process/0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.50mm Optimal 1.2 nozzle @Blocks",
+			"name": "0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.50mm Optimal 1.2 nozzle @Blocks.json"
+			"sub_path": "process/0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.60mm Standard 1.2 nozzle @Blocks",
+			"name": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.60mm Standard 1.2 nozzle @Blocks.json"
+			"sub_path": "process/0.60mm Standard 1.2 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.70mm Draft 1.2 nozzle @Blocks",
+			"name": "0.70mm Draft 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.70mm Draft 1.2 nozzle @Blocks.json"
+			"sub_path": "process/0.70mm Draft 1.2 nozzle @Blocks_Pro_S100.json"
 		},
 		{
-			"name": "0.80mm Extra Draft 1.2 nozzle @Blocks",
+			"name": "0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100",
-			"sub_path": "process/0.80mm Extra Draft 1.2 nozzle @Blocks.json"
+			"sub_path": "process/0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100.json"
 		}
 	],
 	"filament_list": [
@@ -249,48 +249,148 @@
 			"sub_path": "filament/fdm_filament_tpu.json"
 		},
 		{
-			"name": "Generic ABS @Blocks",
+			"name": "Blocks ABS @base",
-			"sub_path": "filament/Generic ABS @Blocks.json"
+			"sub_path": "filament/Blocks ABS @base.json"
 		},
 		{
-			"name": "Generic ASA @Blocks",
+			"name": "Blocks ASA @base",
-			"sub_path": "filament/Generic ASA @Blocks.json"
+			"sub_path": "filament/Blocks ASA @base.json"
 		},
 		{
-			"name": "Generic ASA-CF @Blocks",
+			"name": "Blocks ASA-CF @base",
-			"sub_path": "filament/Generic ASA-CF @Blocks.json"
+			"sub_path": "filament/Blocks ASA-CF @base.json"
 		},
 		{
-			"name": "Generic PA @Blocks",
+			"name": "Blocks PA @base",
-			"sub_path": "filament/Generic PA @Blocks.json"
+			"sub_path": "filament/Blocks PA @base.json"
 		},
 		{
-			"name": "Generic PA-CF @Blocks",
+			"name": "Blocks PA-CF @base",
-			"sub_path": "filament/Generic PA-CF @Blocks.json"
+			"sub_path": "filament/Blocks PA-CF @base.json"
 		},
 		{
-			"name": "Generic PC @Blocks",
+			"name": "Blocks PC @base",
-			"sub_path": "filament/Generic PC @Blocks.json"
+			"sub_path": "filament/Blocks PC @base.json"
 		},
 		{
-			"name": "Generic PETG @Blocks",
+			"name": "Blocks PETG @base",
-			"sub_path": "filament/Generic PETG @Blocks.json"
+			"sub_path": "filament/Blocks PETG @base.json"
 		},
 		{
-			"name": "Generic PLA @Blocks",
+			"name": "Blocks PLA @base",
-			"sub_path": "filament/Generic PLA @Blocks.json"
+			"sub_path": "filament/Blocks PLA @base.json"
 		},
 		{
-			"name": "Generic PLA-CF @Blocks",
+			"name": "Blocks PLA-CF @base",
-			"sub_path": "filament/Generic PLA-CF @Blocks.json"
+			"sub_path": "filament/Blocks PLA-CF @base.json"
 		},
 		{
-			"name": "Generic PVA @Blocks",
+			"name": "Blocks PVA @base",
-			"sub_path": "filament/Generic PVA @Blocks.json"
+			"sub_path": "filament/Blocks PVA @base.json"
 		},
 		{
-			"name": "Generic TPU @Blocks",
+			"name": "Blocks TPU @base",
-			"sub_path": "filament/Generic TPU @Blocks.json"
+			"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"
 		}
 	],
 	"machine_list": [
@@ -0,0 +1,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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,12 +1,13 @@
 {
 	"type": "filament",
-	"name": "Generic ABS @Blocks",
+	"name": "Blocks ABS @base",
 	"inherits": "fdm_filament_abs",
 	"renamed_from": "Blocks Generic ABS",
 	"from": "system",
-	"setting_id": "TL1Q1kA4t36GGObG",
+	"filament_id": "OFBBhiX8",
-	"filament_id": "OFY9muEs",
+	"instantiation": "false",
-	"instantiation": "true",
+	"filament_vendor": [
 		"Blocks"
 	],
 	"filament_flow_ratio": [
 		"0.95"
 	],
@@ -81,13 +82,5 @@
 	],
 	"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,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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,12 +1,13 @@
 {
 	"type": "filament",
-	"name": "Generic ASA @Blocks",
+	"name": "Blocks ASA @base",
 	"inherits": "fdm_filament_asa",
 	"renamed_from": "Blocks Generic ASA",
 	"from": "system",
-	"setting_id": "xP7cB4RHgbm4cYDD",
+	"filament_id": "OFTz2YXa",
-	"filament_id": "OFLPAxz3",
+	"instantiation": "false",
-	"instantiation": "true",
+	"filament_vendor": [
 		"Blocks"
 	],
 	"filament_flow_ratio": [
 		"0.95"
 	],
@@ -81,13 +82,5 @@
 	],
 	"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,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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,12 +1,13 @@
 {
 	"type": "filament",
-	"name": "Generic ASA-CF @Blocks",
+	"name": "Blocks ASA-CF @base",
 	"inherits": "fdm_filament_asa",
 	"renamed_from": "Blocks Generic ASA-CF",
 	"from": "system",
-	"setting_id": "ju4ue7yJoz3ujny6",
+	"filament_id": "OF8b9I7o",
-	"filament_id": "OF53eLVD",
+	"instantiation": "false",
-	"instantiation": "true",
+	"filament_vendor": [
 		"Blocks"
 	],
 	"filament_type": [
 		"ASA-CF"
 	],
@@ -84,13 +85,5 @@
 	],
 	"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,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,17 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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,12 +1,13 @@
 {
 	"type": "filament",
-	"name": "Generic PA-CF @Blocks",
+	"name": "Blocks PA-CF @base",
 	"inherits": "fdm_filament_pa",
 	"renamed_from": "Blocks Generic PA-CF",
 	"from": "system",
-	"setting_id": "T6SO0WRdnG6wcyG8",
+	"filament_id": "OFdWrXpL",
-	"filament_id": "OFQLcbps",
+	"instantiation": "false",
-	"instantiation": "true",
+	"filament_vendor": [
 		"Blocks"
 	],
 	"filament_type": [
 		"PA-CF"
 	],
@@ -87,13 +88,5 @@
 	],
 	"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,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,17 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,16 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,13 @@
 {
 	"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,12 +1,13 @@
 {
 	"type": "filament",
-	"name": "Generic PETG @Blocks",
+	"name": "Blocks PETG @base",
 	"inherits": "fdm_filament_petg",
 	"renamed_from": "Blocks Generic PETG",
 	"from": "system",
-	"setting_id": "NgzPlYItKHbmGgv3",
+	"filament_id": "OF9t1Ga0",
-	"filament_id": "OFYPdQJh",
+	"instantiation": "false",
-	"instantiation": "true",
+	"filament_vendor": [
 		"Blocks"
 	],
 	"filament_flow_ratio": [
 		"0.94"
 	],
@@ -81,18 +82,5 @@
 	],
 	"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"
 	]
 }
@@ -0,0 +1,16 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,13 @@
 {
 	"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,12 +1,13 @@
 {
 	"type": "filament",
-	"name": "Generic PLA @Blocks",
+	"name": "Blocks PLA @base",
 	"inherits": "fdm_filament_pla",
 	"renamed_from": "Blocks Generic PLA",
 	"from": "system",
-	"setting_id": "kjhuttx4T8OtTNmV",
+	"filament_id": "OFVGAC8g",
-	"filament_id": "OFDSrzZ8",
+	"instantiation": "false",
-	"instantiation": "true",
+	"filament_vendor": [
 		"Blocks"
 	],
 	"filament_flow_ratio": [
 		"0.95"
 	],
@@ -39,18 +40,5 @@
 	],
 	"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,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,23 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,14 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,17 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,16 @@
 {
 	"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"
 }
@@ -0,0 +1,13 @@
 {
 	"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"
 	]
 }
@@ -0,0 +1,13 @@
 {
 	"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,12 +1,13 @@
 {
 	"type": "filament",
-	"name": "Generic TPU @Blocks",
+	"name": "Blocks TPU @base",
 	"inherits": "fdm_filament_tpu",
 	"renamed_from": "Blocks Generic TPU",
 	"from": "system",
-	"setting_id": "6iVYOCZo8ugs4JA0",
+	"filament_id": "OFYnedOZ",
-	"filament_id": "OFgbpcy9",
+	"instantiation": "false",
-	"instantiation": "true",
+	"filament_vendor": [
 		"Blocks"
 	],
 	"filament_max_volumetric_speed": [
 		"4"
 	],
@@ -54,18 +55,5 @@
 	],
 	"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"
 	]
 }
@@ -1,24 +0,0 @@
 {
 	"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,24 +0,0 @@
 {
 	"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,30 +0,0 @@
 {
 	"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"
 	]
 }
@@ -1,24 +0,0 @@
 {
 	"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"
 	]
 }
@@ -6,7 +6,7 @@
 	"setting_id": "G7HQgaspHXduDM8O",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks",
+	"default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100",
 	"max_layer_height": [
 		"0.30"
 	],
@@ -25,5 +25,8 @@
 	"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",
+	"default_print_profile": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100",
 	"max_layer_height": [
 		"0.50"
 	],
@@ -26,5 +26,8 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "0.6"
+	"printer_variant": "0.6",
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_Pro_S100"
 	]
 }
@@ -6,7 +6,7 @@
 	"setting_id": "I6PdeCS7SbvIlkZf",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.40mm Standard 0.8 nozzle @Blocks",
+	"default_print_profile": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100",
 	"max_layer_height": [
 		"0.56"
 	],
@@ -26,5 +26,8 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "0.8"
+	"printer_variant": "0.8",
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_Pro_S100"
 	]
 }
@@ -6,7 +6,7 @@
 	"setting_id": "elLdUyy9RhUoa37o",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.50mm Standard 1.0 nozzle @Blocks",
+	"default_print_profile": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100",
 	"max_layer_height": [
 		"0.7"
 	],
@@ -26,5 +26,8 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "1.0"
+	"printer_variant": "1.0",
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_Pro_S100"
 	]
 }
@@ -6,7 +6,7 @@
 	"setting_id": "xtsGSJ4JkbHTPi44",
 	"instantiation": "true",
 	"printer_model": "BLOCKS Pro S100",
-	"default_print_profile": "0.60mm Standard 1.2 nozzle @Blocks",
+	"default_print_profile": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100",
 	"max_layer_height": [
 		"0.8"
 	],
@@ -26,5 +26,8 @@
 	"upward_compatible_machine": [
 		"BLOCKS Pro S100"
 	],
-	"printer_variant": "1.2"
+	"printer_variant": "1.2",
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_Pro_S100"
 	]
 }
@@ -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": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks"
+	"default_materials": "Blocks PLA @Blocks_Pro_S100;Blocks PETG @Blocks_Pro_S100;Blocks TPU @Blocks_Pro_S100"
 }
@@ -34,5 +34,9 @@
 	"printable_height": "500",
 	"upward_compatible_machine": [
 		"BLOCKS RD50 V2"
 	],
 	"printer_variant": "0.4",
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_RD50_V2"
 	]
 }
@@ -35,5 +35,8 @@
 	"deretraction_speed": [
 		"80"
 	],
-	"printer_variant": "0.6"
+	"printer_variant": "0.6",
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_RD50_V2"
 	]
 }
@@ -35,5 +35,8 @@
 	"deretraction_speed": [
 		"80"
 	],
-	"printer_variant": "0.8"
+	"printer_variant": "0.8",
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_RD50_V2"
 	]
 }
@@ -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": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks"
+	"default_materials": "Blocks PLA @Blocks_RD50_V2;Blocks PETG @Blocks_RD50_V2;Blocks TPU @Blocks_RD50_V2"
 }
@@ -51,7 +51,7 @@
 		"12"
 	],
 	"retraction_length": [
-		"1"
+		"1.2"
 	],
 	"retraction_speed": [
 		"60"
@@ -79,5 +79,10 @@
 	],
 	"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"
+		"1.2"
 	],
 	"retraction_speed": [
 		"60"
@@ -75,8 +75,8 @@
 		"BLOCKS RF50"
 	],
 	"machine_start_gcode": [
-		"PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]",
+		"PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]\n",
-		"SET_PRESSURE_ADVANCE ADVANCE=0.046"
+		"SET_PRESSURE_ADVANCE ADVANCE=0.046\n"
 	],
 	"printer_variant": "0.6",
 	"wipe_distance": [
@@ -84,5 +84,10 @@
 	],
 	"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"
+		"1.2"
 	],
 	"retraction_speed": [
 		"60"
@@ -80,5 +80,10 @@
 	],
 	"retract_before_wipe": [
 		"0"
-	]
+	],
 	"default_filament_profile": [
 		"Blocks PLA @Blocks_RF50"
 	],
 	"support_multi_bed_types": "1",
 	"default_bed_type": "Textured PEI Plate"
 }
@@ -8,5 +8,6 @@
 	"bed_model": "RF50 HotBed model.stl",
 	"bed_texture": "RF50 HotBed texture.svg",
 	"hotend_model": "BLOCKS PrintCore.stl",
-	"default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks"
+	"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)"
 }
@@ -123,9 +123,6 @@
 	"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_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -1,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.20mm Standard 0.4 nozzle @Blocks",
+	"name": "0.20mm Standard 0.4 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_blocks_common",
 	"from": "system",
-	"setting_id": "47aDtVL6E5DVr7Mt",
+	"setting_id": "QSEguMMChNFZsK5H",
 	"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_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -61,5 +61,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -1,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.24mm Draft 0.4 nozzle @Blocks",
+	"name": "0.24mm Draft 0.4 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_blocks_common",
 	"from": "system",
-	"setting_id": "ETADjxV6ViJQdnHA",
+	"setting_id": "uALfEFHGmup6vBYI",
 	"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_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -22,7 +22,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -1,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.30mm Extra Draft 0.4 nozzle @Blocks",
+	"name": "0.30mm Extra Draft 0.4 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_blocks_common",
 	"from": "system",
-	"setting_id": "UbuICsmppKDsaaZ4",
+	"setting_id": "HYKF5l2OGvpugSQy",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.30mm Optimal 0.8 nozzle @Blocks",
+	"name": "0.30mm Optimal 0.8 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 0.8 nozzle",
 	"from": "system",
-	"setting_id": "YqkYzp5zdH4R5upm",
+	"setting_id": "OUfZvizM5MGnvHfp",
 	"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_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -1,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.30mm Optimal 1.0 nozzle @Blocks",
+	"name": "0.30mm Optimal 1.0 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "8pBawPScHkyQu0SW",
+	"setting_id": "HGG9WxKVr89qNFDx",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.30mm Standard 0.6 nozzle @Blocks",
+	"name": "0.30mm Standard 0.6 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 0.6 nozzle",
 	"from": "system",
-	"setting_id": "EPI3PAVK9LpJOZWO",
+	"setting_id": "gO2I1YjBl4nf8yzr",
 	"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_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -21,7 +21,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -22,7 +22,7 @@
 	"top_solid_infill_flow_ratio": "0.97",
 	"bottom_solid_infill_flow_ratio": "1.08",
 	"seam_position": "aligned",
-	"sparse_infill_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -1,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.40mm Draft 0.6 nozzle @Blocks",
+	"name": "0.40mm Draft 0.6 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 0.6 nozzle",
 	"from": "system",
-	"setting_id": "CShVKoGspbMJNPw8",
+	"setting_id": "OjsLUl1heqv1cevs",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.40mm Standard 0.8 nozzle @Blocks",
+	"name": "0.40mm Standard 0.8 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 0.8 nozzle",
 	"from": "system",
-	"setting_id": "TSRjmfWaatY7oLJB",
+	"setting_id": "laOTioBGySeudJpl",
 	"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_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -1,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.50mm Draft 0.8 nozzle @Blocks",
+	"name": "0.50mm Draft 0.8 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 0.8 nozzle",
 	"from": "system",
-	"setting_id": "vOtZHrDS88Shmf2m",
+	"setting_id": "oAhgUZdADR7kP87e",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.50mm Optimal 1.2 nozzle @Blocks",
+	"name": "0.50mm Optimal 1.2 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "BKrEAKqDYzdH43wc",
+	"setting_id": "0eqNgX26jemsBfV5",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.50mm Standard 1.0 nozzle @Blocks",
+	"name": "0.50mm Standard 1.0 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "D40iksDm7mFjhSKn",
+	"setting_id": "z1qCW1cEMc4QvBbV",
 	"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_patter": "grid",
+	"sparse_infill_pattern": "grid",
 	"initial_layer_speed": "60",
 	"initial_layer_infill_speed": "80",
 	"initial_travel_speed": "100%",
@@ -57,5 +57,7 @@
 	"accel_to_decel_enable": "1",
 	"accel_to_decel_factor": "50%",
 	"elefant_foot_compensation": "0.25",
-	"elefant_foot_compensation_layers": "1"
+	"elefant_foot_compensation_layers": "1",
 	"skirt_loops": "2",
 	"skirt_type": "perobject"
 }
@@ -1,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.60mm Draft 1.0 nozzle @Blocks",
+	"name": "0.60mm Draft 1.0 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "UJUe8XCBzZf8NyCL",
+	"setting_id": "gTTgtfG8qb9My3hH",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.60mm Standard 1.2 nozzle @Blocks",
+	"name": "0.60mm Standard 1.2 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "PSBFrTykpkytPI2Q",
+	"setting_id": "ApcyToENCIANrI71",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.70mm Draft 1.2 nozzle @Blocks",
+	"name": "0.70mm Draft 1.2 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "0ZQ0USGX9SwAKr29",
+	"setting_id": "DEv7X7zaTfxRQmjo",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.70mm Extra Draft 1.0 nozzle @Blocks",
+	"name": "0.70mm Extra Draft 1.0 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.0 nozzle",
 	"from": "system",
-	"setting_id": "69PFmjOVFBOIp3Qg",
+	"setting_id": "nUW7N9dJmTyQT4AG",
 	"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,14 +1,15 @@
 {
 	"type": "process",
-	"name": "0.80mm Extra Draft 1.2 nozzle @Blocks",
+	"name": "0.80mm Extra Draft 1.2 nozzle @Blocks_Pro_S100",
 	"inherits": "fdm_process_common 1.2 nozzle",
 	"from": "system",
-	"setting_id": "iBwRI5JJewW5HJSv",
+	"setting_id": "JMy62SonRfK0cAdL",
 	"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.12",
+	"version": "02.04.00.13",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [
@@ -6,7 +6,7 @@
 	"filament_id": "OFvgE0Zh",
 	"instantiation": "false",
 	"fan_cooling_layer_time": [
-		"80"
+		"81"
 	],
 	"fan_min_speed": [
 		"50"
@@ -2116,14 +2116,9 @@ int CLI::run(int argc, char **argv)
    // One resolver for the whole run, so presets from the same vendor tree share its load.
    std::unique_ptr<PresetBundle> system_preset_resolver;
-    auto ensure_system_preset_resolver = [&system_preset_resolver]() -> PresetBundle & {
+    auto resolve_preset = [&ensure_cli_preset_bundle, &system_preset_resolver](const std::string &file, DynamicPrintConfig &config,
-        if (!system_preset_resolver)
+                                                                               std::string &config_type, const std::string &config_from,
-            system_preset_resolver = std::make_unique<PresetBundle>();
+                                                                               bool probe_type, std::string &error) {
        return *system_preset_resolver;
    };
    auto resolve_preset = [&ensure_cli_preset_bundle, &ensure_system_preset_resolver](const std::string &file, DynamicPrintConfig &config,
                                                                                      std::string &config_type, const std::string &config_from,
                                                                                      bool probe_type, std::string &error) {
        const auto *inherits = config.option<ConfigOptionString>(BBL_JSON_KEY_INHERITS);
        if (!probe_type && (inherits == nullptr || inherits->value.empty()))
            return true;
@@ -2131,7 +2126,9 @@ int CLI::run(int argc, char **argv)
        PresetBundle                 *bundle = nullptr;
        bool                          allow_source_manifest = false;
        if (config_from == "system") {
-            bundle                = &ensure_system_preset_resolver();
+            if (!system_preset_resolver)
                system_preset_resolver = std::make_unique<PresetBundle>();
            bundle                = system_preset_resolver.get();
            allow_source_manifest = true;
        } else {
            bundle = ensure_cli_preset_bundle(error);
@@ -3123,49 +3120,6 @@ int CLI::run(int argc, char **argv)
        return 0;
    };
    // A project saved before a printer or process option existed has no value for it. The GUI takes such
    // keys from the project's system preset (load_external_preset refreshes every key the project did not
    // override), so fill them from there too instead of leaving them to the option default.
    // The extruder variant keys describe the project's variant layout and are kept as they are, so an
    // older project is not left with a variant list from one layout and ids from another.
    auto fill_missing_project_keys = [this, &ensure_system_preset_resolver](const std::string &system_name, Preset::Type type) {
        if (system_name.empty())
            return;
        static const std::set<std::string> skip_keys = {
            "inherits", "compatible_printers", "compatible_prints", "compatible_printers_condition", "compatible_prints_condition",
            "print_settings_id", "filament_settings_id", "printer_settings_id",
            "print_host", "print_host_webui", "printhost_apikey", "printhost_cafile", "printhost_user", "printhost_password", "printhost_port",
            "printer_extruder_id", "printer_extruder_variant", "print_extruder_id", "print_extruder_variant", "extruder_variant_list"};
        const std::vector<std::string> &options = type == Preset::TYPE_PRINTER ? Preset::printer_options() : Preset::print_options();
        // Keys the legacy handler drops on load can never be in a project, so they do not count as missing.
        auto dropped_on_load = [](std::string key) {
            std::string value;
            PrintConfigDef::handle_legacy(key, value);
            return key.empty();
        };
        std::vector<std::string> missing;
        for (const std::string &key : options)
            if (m_print_config.option(key) == nullptr && skip_keys.count(key) == 0 && !dropped_on_load(key))
                missing.push_back(key);
        if (missing.empty())
            return;
        DynamicPrintConfig system_config;
        std::string        error;
        if (!ensure_system_preset_resolver().resolve_system_preset(system_config, type, system_name, config_substitution_rule, error)) {
            BOOST_LOG_TRIVIAL(warning) << boost::format("CLI: system preset '%1%' not resolved (%2%); keys missing from the project keep their defaults") % system_name % error;
            return;
        }
        for (const std::string &key : missing)
            if (const ConfigOption *opt = system_config.option(key)) {
                m_print_config.set_key_value(key, opt->clone());
                BOOST_LOG_TRIVIAL(info) << boost::format("CLI: %1% missing from the project, taken from '%2%': %3%") % key % system_name % opt->serialize();
            }
    };
    if (new_printer_name.empty())
        fill_missing_project_keys(current_printer_system_name, Preset::TYPE_PRINTER);
    if (new_process_name.empty())
        fill_missing_project_keys(current_process_system_name, Preset::TYPE_PRINT);
    std::vector<std::string>& different_settings = m_print_config.option<ConfigOptionStrings>("different_settings_to_system", true)->values;
    std::vector<std::string>& inherits_group = m_print_config.option<ConfigOptionStrings>("inherits_group", true)->values;
    inherits_group.resize(filament_count + 2, std::string());
@@ -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,6 +15,8 @@
 #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,6 +25,7 @@
 #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,6 +7969,20 @@ 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;
@@ -8311,6 +8325,13 @@ 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},
@@ -8331,7 +8352,8 @@ 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));
+                                                                              ref_speed, speed, NOZZLE_CONFIG(slowdown_for_curled_perimeters),
                                                                              fan_overlap_threshold);
        	}else{
                ConfigOptionFloatsOrPercents dynamic_overhang_speeds(
                                                                     {FloatOrPercent{100, true},
@@ -8350,7 +8372,8 @@ 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));
+                                                                              ref_speed, speed, NOZZLE_CONFIG(slowdown_for_curled_perimeters),
                                                                              fan_overlap_threshold);
            }
            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)
@@ -8502,28 +8525,10 @@ 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;
      }
-      switch (overhang_fan_threshold) {
+      if (overhang_fan_threshold == Overhang_threshold_none)
      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);
-        break;
+      const float overlap_threshold = overhang_fan_overlap_threshold(overhang_fan_threshold);
-      default:
+      return overlap_threshold >= 0.f && overlap <= overlap_threshold;
        return false;
      }
    };
    std::string comment;
@@ -41,10 +41,12 @@ std::vector<ExtendedPoint<L::Dim>> estimate_points_properties(const POINTS&
                                                              float                                   flow_width,
                                                              float                                   max_line_length = -1.0f,
                                                              float                                   min_distance    = -1.0f,
-                                                              // Maps an overhang distance onto the speed it will be printed at. Interior sampling
+                                                              // Speed an overhang distance prints at. Without it, interior sampling
-                                                              // needs it to tell which of the points it could add would change the G-code, and is
+                                                              // is skipped and every line over 4mm is split.
-                                                              // skipped without it.
+                                                              const std::function<float(float)>&      distance_to_speed = {},
-                                                              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)
 {
    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) {
@@ -125,29 +127,43 @@ 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 an interior that is supported
+    // 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 caged by
+    // differently from both ends is invisible to them. The outer perimeter of an overhang whose ends are supported by
-    // full height walls reads as supported along its whole length. Probe the interior, keep the samples the
+    // reads as supported along its whole length. Probe the interior, keep the samples the endpoint interpolation fails to predict, 
-    // endpoint interpolation fails to predict, and bisect either side of each one, so a span that is only partly
+    // and bisect either side of each one, so a span that is only partly unsupported gets points where its support actually changes 
-    // unsupported gets points where its support actually changes instead of one reading spread across all of it.
+    // instead of one reading being spread across all of it.
-    if (PREV_LAYER_BOUNDARY_OFFSET && ADD_INTERSECTIONS && min_distance > 0 && distance_to_speed) {
+    // 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)) {
        // 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 speed transition.
+        // together than min_spacing, so finer discovery would not produce a more precise 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; };
@@ -185,8 +201,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
+                // Coarse probing keeps every sample it took until this pass can see which ones bracket a speed or
-                // transition. Matching samples cannot be discarded during discovery: one may be the last
+                // fan 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) {
@@ -195,15 +211,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 at a different speed from the
+                    // A sample is worth a point in the path only where it prints differently, in speed or fan state,
-                    // readings either side of it. Differing from one of the segment's own ends is not enough on
+                    // 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 the faster of the two: the segmentation pass below already
+                    // its own where the sample is not the slower or cooled of the two: the segmentation pass below
-                    // ends the slowdown an end reads, at a distance taken from how far out that end is rather
+                    // already confines the slowdown and cooling at an end, at a distance taken from how far out that
-                    // than from wherever bisection happened to stop, and a point here would leave the span
+                    // end is rather than from wherever bisection happened to stop, and a point here would leave the
-                    // beside the end too short for that pass to run at all. Support an end cannot account for,
+                    // 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.
+                    // 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(sample, before) && (!at_start || prints_slower(sample, before));
+                    const bool worth_before = !same_speed_and_fan(sample, before) && (!at_start || slower_or_cooled(sample, before));
-                    const bool worth_after  = !same_speed(sample, after) && (!at_end || prints_slower(sample, after));
+                    const bool worth_after  = !same_speed_and_fan(sample, after) && (!at_end || slower_or_cooled(sample, after));
                    if (worth_before || worth_after)
                        interior[kept++] = interior[i];
                }
@@ -238,52 +254,60 @@ 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: Segment path to smaller lines by adding additional points only if the path has an overhang that
+                // ORCA: A line prints as slow as its slower end and is cooled if either end is, so an overhang at one
-                // will trigger a slowdown and the path is also reasonably large, i.e. 2mm in length or more
+                // end would otherwise slow down or cool the whole line. Split the line so that only the part beside
-                // If there is no overhang in the start/end point, dont segment it.
+                // that end prints that way, if the line is reasonably long (2mm or more) and at least one end prints
-                // Ignore this check if the control of segmentation for overhangs is disabled (min_distance=-1)
+                // slower or cooled compared with a supported point (overhang distance 0). Deciding on how the end
-                if ((min_distance > 0 && ((std::abs(curr.distance) > min_distance) || (std::abs(next.distance) > min_distance)) && line_len >= 2.f) ||
+                // prints, rather than on its overhang distance against min_distance, also catches an end whose overhang
-                    (min_distance <= 0 && line_len > 4.0f)) {
+                // 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.
                    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);
-                    if (t0 < 1.0) {
+                    // Up to two cut points, in order along the line. Each takes its own overhang distance, so every
-                        Vec p0                          = curr.position + t0 * (next.position - curr.position);
+                    // piece prints by the overhang distances at its own two ends. t0 >= 1 or t1 <= 0 falls on the
-                        auto [p0_dist, p0_near_l, p0_x] = unscaled_prev_layer.template distance_from_lines_extra<SIGNED_DISTANCE>(
+                    // line's own end, so there is no cut. A cut closer than min_spacing to either end of the line is
-                            p0.template cast<AABBScalar>());
+                    // not meaningful and is filtered out (#6714).
-                        ExtendedPoint<L::Dim> new_p{};
+                    ExtendedPoint<L::Dim> cut[2]{};
-                        new_p.position = p0;
+                    bool                  keep[2] = {false, false};
-                        new_p.distance = float(p0_dist + boundary_offset);
+                    for (int k = 0; k < 2; ++k) {
-                        // ORCA: only create a new point in the path if the new point overhang distance will be used to generate a speed change
+                        const double t = k == 0 ? t0 : t1;
-                        // or if this option is disabled (min_distance<=0)
+                        if (k == 0 ? t >= 1.0 : t <= 0.0)
-                        if( (std::abs(p0_dist) > min_distance) || (min_distance<=0)){
+                            continue;
-                            // ORCA: also filter out points that are introduced to the start of the path when their distance from the start point is
+                        const Vec p                  = curr.position + t * (next.position - curr.position);
-                            // not meaningful
+                        auto [p_dist, p_near_l, p_x] = unscaled_prev_layer.template distance_from_lines_extra<SIGNED_DISTANCE>(
-                            if ((p0 - curr.position).norm() > min_spacing && (next.position - p0).norm() > min_spacing) {
+                            p.template cast<AABBScalar>());
-                                new_points.push_back(new_p);
+                        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 (t1 > 0.0) {
+                    if (distance_to_speed) {
-                        Vec p1                          = curr.position + t1 * (next.position - curr.position);
+                        // Only keep a cut that changes the G-code: one that prints differently from at least one of the
-                        auto [p1_dist, p1_near_l, p1_x] = unscaled_prev_layer.template distance_from_lines_extra<SIGNED_DISTANCE>(
+                        // points either side of it, which are the line's ends or the other cut where that is kept. A cut
-                            p1.template cast<AABBScalar>());
+                        // that prints like both would only split a move into two identical ones.
-                        ExtendedPoint<L::Dim> new_p{};
+                        if (keep[0])
-                        new_p.position = p1;
+                            keep[0] = !same_speed_and_fan(cut[0].distance, curr.distance) ||
-                        new_p.distance = float(p1_dist + boundary_offset);
+                                      !same_speed_and_fan(cut[0].distance, keep[1] ? cut[1].distance : next.distance);
-                        // ORCA: only create a new point in the path if the new point overhang distance will be used to generate a speed change
+                        if (keep[1])
-                        // or if this option is disabled (min_distance<=0)
+                            keep[1] = !same_speed_and_fan(cut[1].distance, keep[0] ? cut[0].distance : curr.distance) ||
-                        if( (std::abs(p1_dist) > min_distance) || (min_distance<=0)){
+                                      !same_speed_and_fan(cut[1].distance, next.distance);
-                            // ORCA: filter out points that are introduced to the end of the path when their distance from the end point is
+                        // Two cuts closer together than min_spacing would leave a micro segment between them, so only the
-                            // not meaningful
+                        // first is kept.
-                            if ((p1 - curr.position).norm() > min_spacing && (next.position - p1).norm() > min_spacing) {
+                        if (keep[0] && keep[1] && (cut[1].position - cut[0].position).norm() <= min_spacing)
-                                new_points.push_back(new_p);
+                            keep[1] = false;
                            }
                        }
                    }
                    for (int k = 0; k < 2; ++k)
                        if (keep[k])
                            new_points.push_back(cut[k]);
                }
            }
            new_points.push_back(next);
@@ -423,7 +447,10 @@ public:
                                                           const ConfigOptionFloatsOrPercents &speeds,
                                                           float                               ext_perimeter_speed,
                                                           float                               original_speed,
-                                                           bool								   slowdown_for_curled_edges)
+                                                           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)
    {
        size_t                               speed_sections_count = std::min(overlaps.values.size(), speeds.values.size());
        std::vector<std::pair<float, float>> speed_sections;
@@ -463,7 +490,8 @@ public:
            }
        }
-        // If a meaningful (i.e. needing slowdown) overhang distance was not found, then we shouldn't split the lines
+        // 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 (!found)
            smallest_distance_with_lower_speed=-1.f;
@@ -487,9 +515,17 @@ 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, calculate_speed);
+                                                               smallest_distance_with_lower_speed, effective_speed, fan_overlap_threshold);
        const auto width_inv = 1.0f / path.width;
        std::vector<ProcessedPoint> processed_points;
        processed_points.reserve(extended_points.size());
@@ -575,20 +575,18 @@ bool PresetBundle::resolve_preset_config(DynamicPrintConfig &config, Preset::Typ
 const PresetBundle *PresetBundle::load_source_vendor(const boost::filesystem::path &root_dir,
                                                    const std::string &vendor_id,
                                                    ForwardCompatibilitySubstitutionRule compatibility_rule,
-                                                    std::string &error, bool allow_cache)
+                                                    std::string &error)
 {
-    auto key = std::make_tuple(root_dir.string(), vendor_id, compatibility_rule, allow_cache);
+    auto key = std::make_tuple(root_dir.string(), vendor_id, compatibility_rule);
    if (auto it = m_source_vendor_bundles.find(key); it != m_source_vendor_bundles.end())
        return it->second.get();
    // The library loads with no base of its own, so the tree a vendor inherits from
    // is the same one that resolves the library's own presets.
-    const std::string   library_file = std::string(ORCA_FILAMENT_LIBRARY);
+    const PresetBundle *library = nullptr;
    const PresetBundle *library      = nullptr;
    if (vendor_id != ORCA_FILAMENT_LIBRARY &&
-        (boost::filesystem::is_regular_file(root_dir / (library_file + ".json")) ||
+        boost::filesystem::is_regular_file(root_dir / (std::string(ORCA_FILAMENT_LIBRARY) + ".json"))) {
-         (allow_cache && boost::filesystem::is_regular_file(root_dir / (library_file + ".opc"))))) {
+        library = load_source_vendor(root_dir, ORCA_FILAMENT_LIBRARY, compatibility_rule, error);
        library = load_source_vendor(root_dir, ORCA_FILAMENT_LIBRARY, compatibility_rule, error, allow_cache);
        if (library == nullptr) {
            error = "OrcaFilamentLibrary contains invalid presets";
            return nullptr;
@@ -597,7 +595,7 @@ const PresetBundle *PresetBundle::load_source_vendor(const boost::filesystem::pa
    auto bundle = std::make_unique<PresetBundle>();
    bundle->m_preserve_vendor_source_paths = true;
-    bundle->load_vendor_configs_from_json(root_dir.string(), vendor_id, LoadSystem, compatibility_rule, library, allow_cache);
+    bundle->load_vendor_configs_from_json(root_dir.string(), vendor_id, LoadSystem, compatibility_rule, library, false);
    if (bundle->error_count() != 0) {
        error = "Vendor bundle contains invalid presets";
        return nullptr;
@@ -640,43 +638,6 @@ bool PresetBundle::resolve_preset_config_type(DynamicPrintConfig &config, Preset
    return true;
 }
 bool PresetBundle::resolve_system_preset(DynamicPrintConfig &config, Preset::Type type, const std::string &name,
                                         ForwardCompatibilitySubstitutionRule compatibility_rule, std::string &error)
 {
    const std::string vendor_id = find_preset_vendor(name, type);
    if (vendor_id.empty()) {
        error = "No vendor lists the preset";
        return false;
    }
    // Release builds ship a vendor as its preset cache alone, without the profile JSONs.
    auto installed = [&vendor_id](const fs::path &root) {
        return fs::is_regular_file(root / (vendor_id + ".json")) || fs::is_regular_file(root / (vendor_id + ".opc"));
    };
    fs::path root_dir = fs::path(data_dir()) / PRESET_SYSTEM_DIR;
    if (!installed(root_dir))
        root_dir = fs::path(resources_dir()) / PRESET_PROFILES_DIR;
    const bool cache_only = !fs::is_regular_file(root_dir / (vendor_id + ".json"));
    try {
        const PresetBundle *vendor = load_source_vendor(root_dir, vendor_id, compatibility_rule, error, cache_only);
        if (vendor == nullptr)
            return false;
        const PresetCollection &collection = type == Preset::TYPE_PRINTER ? vendor->printers :
                                             type == Preset::TYPE_PRINT   ? vendor->prints : vendor->filaments;
        const Preset *preset = collection.find_preset(name, false);
        if (preset == nullptr) {
            error = "Preset was not found in its vendor bundle";
            return false;
        }
        config = preset->config;
    } catch (const std::exception &ex) {
        error = ex.what();
        return false;
    }
    error.clear();
    return true;
 }
 PresetBundle::PresetBundle(const PresetBundle &rhs)
 {
    *this = rhs;
@@ -273,10 +273,6 @@ public:
                                    const std::string &source_file,
                                    ForwardCompatibilitySubstitutionRule compatibility_rule,
                                    std::string &error, bool allow_source_manifest = true);
    // Resolve a system preset by name. The vendor tree is read from data_dir()/system when installed
    // there, as the GUI reads it, and from the bundled profiles otherwise.
    bool resolve_system_preset(DynamicPrintConfig &config, Preset::Type type, const std::string &name,
                               ForwardCompatibilitySubstitutionRule compatibility_rule, std::string &error);
    // Load selections (current print, current filaments, current printer) from config.ini
    // This is done just once on application start up.
@@ -667,14 +663,13 @@ private:
    // Vendor trees loaded by resolve_preset_config's manifest path, so every preset
    // resolved through this bundle shares one load per source root and vendor. The
    // filament library is one such tree, shared by every vendor under its root.
-    // A tree read from its preset cache is kept apart: its presets carry no source file.
+    std::map<std::tuple<std::string, std::string, ForwardCompatibilitySubstitutionRule>, std::unique_ptr<PresetBundle>>
    std::map<std::tuple<std::string, std::string, ForwardCompatibilitySubstitutionRule, bool>, std::unique_ptr<PresetBundle>>
        m_source_vendor_bundles;
    const PresetBundle *load_source_vendor(const boost::filesystem::path &root_dir,
                                           const std::string &vendor_id,
                                           ForwardCompatibilitySubstitutionRule compatibility_rule,
-                                           std::string &error, bool allow_cache = false);
+                                           std::string &error);
    // Orca: validation only - flag any printer with two or more compatible
    // filament presets sharing one filament_id (ambiguous AMS subtype match).
@@ -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 std::exception& e) {
+    } 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.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;
    } catch (const std::exception& e) {
        fail(_L("Mesh conversion failed: ") + wxString::FromUTF8(e.what()));
        return;
    }
    if (shape.IsNull()) { fail(_L("Mesh conversion produced no geometry")); return; }
@@ -15,11 +15,3 @@ set_tests_properties(cli_strict_mode PROPERTIES
    LABELS "CLI;RequiresApp"
    SKIP_RETURN_CODE 77
    TIMEOUT 900)
 add_test(NAME cli_project_missing_keys
    COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test_cli_project_missing_keys.sh $<TARGET_FILE:OrcaSlicer> ${ORCA_CLI_TEST_PYTHON}
        ${CMAKE_SOURCE_DIR}/resources/profiles/BBL)
 set_tests_properties(cli_project_missing_keys PROPERTIES
    LABELS "CLI;RequiresApp"
    SKIP_RETURN_CODE 77
    TIMEOUT 900)
@@ -1,89 +0,0 @@
 #!/usr/bin/env bash
 # End-to-end check that the CLI fills settings missing from a project from the project's system presets.
 #
 # A project saved before an option existed has no value for it. The GUI takes such keys from the
 # project's system printer and process presets, not from the option defaults, and the CLI must slice
 # the project with the same values. A project is exported from the shipped Bambu Lab P1S presets, one
 # printer key and one process key are removed from it, one kept key is changed, and it is sliced again.
 #
 # usage: test_cli_project_missing_keys.sh <orca-slicer binary> <python3> <resources/profiles/BBL>
 set -u
 BIN="${1:-}"
 PY="${2:-python3}"
 PROFILES="${3:-}"
 # 77 is the test's SKIP_RETURN_CODE.
 [ -x "$BIN" ] || { echo "SKIP: orca-slicer binary not found: $BIN"; exit 77; }
 [ -d "$PROFILES" ] || { echo "FAIL: profiles directory not found: $PROFILES"; exit 1; }
 WORK="$(mktemp -d "${TMPDIR:-/tmp}/orca-cli-missing-keys.XXXXXX")"
 trap 'rm -rf "$WORK"' EXIT
 "$PY" - "$WORK/cube.stl" <<'EOF'
 import sys
 v = [(x, y, z) for z in (0, 10) for y in (0, 10) for x in (0, 10)]
 with open(sys.argv[1], "w") as f:
    f.write("solid cube\n")
    for a, b, c, d in ((0, 2, 3, 1), (4, 5, 7, 6), (0, 1, 5, 4), (2, 6, 7, 3), (0, 4, 6, 2), (1, 3, 7, 5)):
        for tri in ((v[a], v[b], v[c]), (v[a], v[c], v[d])):
            f.write("facet normal 0 0 0\nouter loop\n")
            for p in tri:
                f.write("vertex %g %g %g\n" % p)
            f.write("endloop\nendfacet\n")
    f.write("endsolid cube\n")
 EOF
 # slice <tag> <input> [option...]: slice into $WORK/<tag>/out.3mf with a fresh data directory.
 slice() {
    local out="$WORK/$1" input="$2"; shift 2
    mkdir -p "$out"
    timeout 300 "$BIN" --datadir "$out/datadir" "$@" --slice 0 --outputdir "$out" --export-3mf out.3mf "$input" \
        > "$out/log" 2>&1 || { echo "FAIL: $1: orca-slicer exited $?"; tail -n 40 "$out/log"; exit 1; }
 }
 slice base "$WORK/cube.stl" \
    --load-settings "$PROFILES/machine/Bambu Lab P1S 0.4 nozzle.json;$PROFILES/process/0.20mm Standard @BBL X1C.json" \
    --load-filaments "$PROFILES/filament/Bambu PLA Basic @BBL P1S 0.4 nozzle.json"
 # The removed keys, with their option defaults from PrintConfig.cpp, and a kept key with a new value.
 "$PY" - "$WORK/base/out.3mf" "$WORK/old.3mf" <<'EOF' || exit $?
 import json, sys, zipfile
 src, dst = sys.argv[1], sys.argv[2]
 missing = {"extruder_clearance_dist_to_rod": "40", "sparse_infill_density": "20%"}
 with zipfile.ZipFile(src) as zin, zipfile.ZipFile(dst, "w", zipfile.ZIP_DEFLATED) as zout:
    for item in zin.infolist():
        data = zin.read(item.filename)
        if item.filename == "Metadata/project_settings.config":
            config = json.loads(data)
            for key, default in missing.items():
                if config[key] == default:
                    print("SKIP: %s is %s in the system preset, the option default, so the test cannot tell them apart" % (key, default))
                    sys.exit(77)
            expected = {key: config.pop(key) for key in missing}
            expected["wall_loops"] = str(int(config["wall_loops"]) + 1)
            config["wall_loops"] = expected["wall_loops"]
            data = json.dumps(config, indent=4)
        zout.writestr(item, data)
 with open(dst + ".expected.json", "w") as f:
    json.dump(expected, f)
 EOF
 slice project "$WORK/old.3mf"
 "$PY" - "$WORK/project/out.3mf" "$WORK/old.3mf.expected.json" <<'EOF'
 import json, sys, zipfile
 with zipfile.ZipFile(sys.argv[1]) as z:
    config = json.loads(z.read("Metadata/project_settings.config"))
 with open(sys.argv[2]) as f:
    expected = json.load(f)
 errors = ["%s is %r, want %r" % (key, config.get(key), want) for key, want in expected.items() if config.get(key) != want]
 for e in errors:
    print("FAIL: " + e)
 sys.exit(1 if errors else 0)
 EOF
 status=$?
 [ "$status" -eq 0 ] || { tail -n 40 "$WORK/project/log"; exit 1; }
 echo "PASS"
@@ -244,6 +244,44 @@ float furthest_reading(const std::vector<ExtendedPoint<2>>& points)
           })->distance;
 }
 // A wall along a supported edge of the previous layer, ending past or just short of the edge's end. Crossing the edge's
 // end reads half a line width out.
 constexpr double edge_run_length = 64.;   // mm, wall start, measured from the end of the previous layer's edge
 constexpr double edge_step       = 0.384; // mm, how far this layer's contour extends past the previous layer's end
 // The centreline is inset half a line width from the contour.
 constexpr double edge_wall_end_past  = edge_step - 0.5 * caged_wall_width;
 constexpr double edge_wall_end_short = 0.05; // mm short of the edge, reading 0.21 - 0.05 = 0.16mm out
 // Segmentation splits 1.5 line widths plus the end's reading from an end, so an end's slowdown and cooling stay within this.
 constexpr double edge_affected_length = 3. * caged_wall_width;
 std::vector<ExtendedPoint<2>> sampled_wall_along_edge(double                              wall_end_x,
                                                      const std::function<float(float)>& distance_to_speed,
                                                      float                               min_distance,
                                                      float                               fan_overlap_threshold)
 {
    const AABBTreeLines::LinesDistancer<Linef> prev_layer(std::vector<Linef>{
        {{0., 0.}, {edge_run_length + 10., 0.}},
        {{edge_run_length + 10., 0.}, {edge_run_length + 10., -10.}},
        {{edge_run_length + 10., -10.}, {0., -10.}},
        {{0., -10.}, {0., 0.}},
    });
    const double wall_y = -0.5 * caged_wall_width;
    const Points wall{Point::new_scale(edge_run_length, wall_y), Point::new_scale(wall_end_x, wall_y)};
    return estimate_points_properties<true, true, true, true>(wall, prev_layer, caged_wall_width, -1.f, min_distance,
                                                              distance_to_speed, fan_overlap_threshold);
 }
 // Length printed with the overhang fan on: segments with either end's overlap at or below the threshold.
 double cooled_length(const std::vector<ExtendedPoint<2>>& points, float fan_overlap_threshold)
 {
    double length = 0.;
    for (size_t i = 0; i + 1 < points.size(); ++i)
        if (1.f - std::max(points[i].distance, points[i + 1].distance) / float(caged_wall_width) <= fan_overlap_threshold)
            length += (points[i + 1].position - points[i].position).norm();
    return length;
 }
 DynamicPrintConfig caged_overhang_config(const char* wall_generator){
    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
    config.set_deserialize_strict({
@@ -431,6 +469,61 @@ TEST_CASE("A supported wall between overhanging corners is slowed no further tha
    REQUIRE(sampled <= unsampled);
 }
 // Regression: the line up to a step past the previous layer was not split, so the step's slowdown and cooling covered the
 // whole wall. The split required an end reading beyond where the slowdown begins, and an edge crossing reads exactly
 // there when the wall speed is held below the reference speed (e.g. resonance avoidance).
 TEST_CASE("A wall stepping past the previous layer is slowed and cooled only beside the step", "[ExtrusionProcessor][Regression]")
 {
    const float crossing_reading = 0.5f * float(caged_wall_width);
    const std::function<float(float)> distance_to_speed = [crossing_reading](float distance) {
        return distance < crossing_reading ? 70.f : 15.f;
    };
    const float fan_overlap_threshold = 0.75f; // The fan switches on at a 25% overhang
    const std::vector<ExtendedPoint<2>> points = sampled_wall_along_edge(-edge_wall_end_past, distance_to_speed, crossing_reading,
                                                                         fan_overlap_threshold);
    const double slowed = slowed_length(points, distance_to_speed);
    const double cooled = cooled_length(points, fan_overlap_threshold);
    REQUIRE(slowed > 0.);
    REQUIRE(cooled > 0.);
    REQUIRE(slowed < edge_affected_length);
    REQUIRE(cooled < edge_affected_length);
 }
 // Regression: the fan can switch on at a smaller overhang than the first slowdown. Splitting only on speed changes left
 // the whole wall cooled when its end read between the two.
 TEST_CASE("A wall is split where only the overhang fan changes", "[ExtrusionProcessor][Regression]")
 {
    const float crossing_reading = 0.5f * float(caged_wall_width);
    const std::function<float(float)> distance_to_speed = [crossing_reading](float distance) {
        return distance < crossing_reading ? 70.f : 15.f;
    };
    // The end reads 0.16mm out (overlap 0.62): cooled at a 25% threshold, but not slowed.
    const float fan_overlap_threshold = 0.75f;
    const std::vector<ExtendedPoint<2>> points = sampled_wall_along_edge(edge_wall_end_short, distance_to_speed, crossing_reading,
                                                                         fan_overlap_threshold);
    const double cooled = cooled_length(points, fan_overlap_threshold);
    REQUIRE_THAT(slowed_length(points, distance_to_speed), Catch::Matchers::WithinAbs(0., 1e-9));
    REQUIRE(cooled > 0.);
    REQUIRE(cooled < edge_affected_length);
 }
 // With one speed and a fan threshold no reading reaches, only the wall's ends and the edge crossing remain.
 TEST_CASE("A wall is left whole where neither its speed nor its cooling changes", "[ExtrusionProcessor]")
 {
    const std::function<float(float)> distance_to_speed = [](float) { return 70.f; };
    // 95% overhang; the step reads 0.384mm out (overlap 0.09).
    const float fan_overlap_threshold = 0.05f;
    const std::vector<ExtendedPoint<2>> points = sampled_wall_along_edge(-edge_wall_end_past, distance_to_speed, -1.f,
                                                                         fan_overlap_threshold);
    REQUIRE(points.size() == 3);
 }
 TEST_CASE("Benchmark caged overhang interior sampling", "[ExtrusionProcessor][!benchmark]"){
    const char* wall_generator = GENERATE("classic", "arachne");
@@ -5405,35 +5405,6 @@ struct ScopedDataDir
    ~ScopedDataDir() { set_data_dir(previous); }
 };
 // resources_dir() is process-wide too; system preset lookups scan its profiles directory.
 struct ScopedResourcesDir
 {
    std::string previous = resources_dir();
    explicit ScopedResourcesDir(const fs::path &dir) { set_resources_dir(dir.string()); }
    ~ScopedResourcesDir() { set_resources_dir(previous); }
 };
 // An "Acme" vendor under root whose "Acme Printer" inherits extruder_clearance_dist_to_rod from an
 // abstract base, with the printer in a nested sub_path so the name cannot be derived from the file.
 void write_acme_printer_vendor(const fs::path &root, double dist_to_rod)
 {
    const fs::path machine_dir = root / "Acme" / "machine";
    fs::create_directories(machine_dir / "nested");
    std::ofstream((root / "Acme.json").string())
        << R"({"version":"1.0.0","name":"Acme",)"
        << R"("machine_model_list":[{"name":"Acme One","sub_path":"machine/model.json"}],"machine_list":[)"
        << R"({"name":"fdm_acme_common","sub_path":"machine/base.json"},)"
        << R"({"name":"Acme Printer","sub_path":"machine/nested/printer.json"}]})";
    std::ofstream((machine_dir / "model.json").string())
        << R"({"type":"machine_model","name":"Acme One","nozzle_diameter":"0.4"})";
    std::ofstream((machine_dir / "base.json").string())
        << R"({"type":"machine","name":"fdm_acme_common","from":"system","instantiation":"false",)"
        << R"("extruder_clearance_dist_to_rod":")" << dist_to_rod << R"("})";
    std::ofstream((machine_dir / "nested" / "printer.json").string())
        << R"({"type":"machine","name":"Acme Printer","from":"system","instantiation":"true","inherits":"fdm_acme_common",)"
        << R"("printer_model":"Acme One","printer_variant":"0.4"})";
 }
 std::string read_file(const fs::path &file)
 {
    std::ifstream in(file.string(), std::ios::binary);
@@ -5511,75 +5482,3 @@ TEST_CASE("Config import confines zip entries, preset names and bundle ids to th
        CHECK_FALSE(any_filename_contains(temp_dir.path(), "bundle-escape"));
    }
 }
 TEST_CASE("A system preset resolves by name from the bundled profiles", "[Preset][Bundle]")
 {
    ScopedTemporaryDir temp_dir;
    ScopedDataDir      data(temp_dir.path() / "data");
    ScopedResourcesDir resources(temp_dir.path() / "resources");
    write_acme_printer_vendor(temp_dir.path() / "resources" / "profiles", 33.);
    PresetBundle       bundle;
    DynamicPrintConfig config;
    std::string        error;
    REQUIRE(bundle.resolve_system_preset(config, Preset::TYPE_PRINTER, "Acme Printer",
                                         ForwardCompatibilitySubstitutionRule::EnableSilent, error));
    CHECK(error.empty());
    CHECK_THAT(config.opt_float("extruder_clearance_dist_to_rod"), Catch::Matchers::WithinAbs(33., 1e-6));
 }
 TEST_CASE("A system preset resolves from the data directory copy of its vendor", "[Preset][Bundle]")
 {
    ScopedTemporaryDir temp_dir;
    ScopedDataDir      data(temp_dir.path() / "data");
    ScopedResourcesDir resources(temp_dir.path() / "resources");
    write_acme_printer_vendor(temp_dir.path() / "resources" / "profiles", 33.);
    write_acme_printer_vendor(temp_dir.path() / "data" / PRESET_SYSTEM_DIR, 35.);
    PresetBundle       bundle;
    DynamicPrintConfig config;
    std::string        error;
    REQUIRE(bundle.resolve_system_preset(config, Preset::TYPE_PRINTER, "Acme Printer",
                                         ForwardCompatibilitySubstitutionRule::EnableSilent, error));
    CHECK_THAT(config.opt_float("extruder_clearance_dist_to_rod"), Catch::Matchers::WithinAbs(35., 1e-6));
 }
 TEST_CASE("A system preset resolves from a vendor shipped as its preset cache alone", "[Preset][Bundle]")
 {
    ScopedTemporaryDir temp_dir;
    ScopedDataDir      data(temp_dir.path() / "data");
    ScopedResourcesDir resources(temp_dir.path() / "resources");
    const fs::path     profiles = temp_dir.path() / "resources" / "profiles";
    write_acme_printer_vendor(profiles, 33.);
    PresetBundle writer;
    writer.set_generate_vendor_caches(true);
    writer.load_vendor_configs_from_json(profiles.string(), "Acme", PresetBundle::LoadSystem,
                                         ForwardCompatibilitySubstitutionRule::EnableSilent);
    REQUIRE(fs::exists(profiles / "Acme.opc"));
    // Release builds ship the cache and drop the profile JSONs, manifest included.
    fs::remove(profiles / "Acme.json");
    fs::remove_all(profiles / "Acme");
    PresetBundle       bundle;
    DynamicPrintConfig config;
    std::string        error;
    REQUIRE(bundle.resolve_system_preset(config, Preset::TYPE_PRINTER, "Acme Printer",
                                         ForwardCompatibilitySubstitutionRule::EnableSilent, error));
    CHECK_THAT(config.opt_float("extruder_clearance_dist_to_rod"), Catch::Matchers::WithinAbs(33., 1e-6));
 }
 TEST_CASE("A system preset no vendor lists is not resolved", "[Preset][Bundle]")
 {
    ScopedTemporaryDir temp_dir;
    ScopedDataDir      data(temp_dir.path() / "data");
    ScopedResourcesDir resources(temp_dir.path() / "resources");
    write_acme_printer_vendor(temp_dir.path() / "resources" / "profiles", 33.);
    PresetBundle       bundle;
    DynamicPrintConfig config;
    std::string        error;
    CHECK_FALSE(bundle.resolve_system_preset(config, Preset::TYPE_PRINTER, "Unknown Printer",
                                             ForwardCompatibilitySubstitutionRule::EnableSilent, error));
    CHECK_FALSE(error.empty());
 }
Author	SHA1	Message	Date
Ian Chua	576cce2f72	test: bump elegoo profile to test OFL OTA E2E [TO BE REVERTED] (#15954 ) Merged by /bot merge on behalf of @peachismomo (id 52488812). Grants: resources/profiles/OrcaFilamentLibrary/filament/Elegoo, resources/profiles/OrcaFilamentLibrary.json, resources/profiles/Elegoo, resources/profiles/Elegoo.json Head: `d4a18c633e`	2026-09-28 10:47:41 +00:00
Kenneth Rapleeandyw4z	f3a8f711fd	Catch Standard_Failure before std::exception (OCCT >= 8) (#15826 ) Co-authored-by: yw4z <ywsyildiz@gmail.com>	2026-09-28 13:44:32 +03:00
Kenneth Rapleeandyw4z	00bde9265b	Add missing OCCT (8.x) header includes (#15825 ) * Add missing TopTools includes to GeometryEngine.cpp * Add missing TDF_LabelSequence include in STEP.cpp --------- Co-authored-by: yw4z <ywsyildiz@gmail.com>	2026-09-28 13:42:25 +03:00
Ioannis Giannakas	7707487252	Fix overhang slowdown and fan applied to whole walls ahead of an overhang (#15945 )	2026-09-28 10:59:39 +01:00
Hugo Costa	3df9c215f8	Blocks: branded filaments, naming/loading fixes, RF50 bed type and other fixes. (#15804 ) # Description <!-- > Please provide a summary of the changes made in this PR. Include details such as: > * What issue does this PR address or fix? > * What new features or enhancements does this PR introduce? > * Are there any breaking changes or dependencies that need to be considered? --> This PR fixes some problems with the current profiles for Blocks printers - Fix: start gcode for the Blocks 0.6mm RF50 printer where the start gcode command had no newline separation on two commands so they were concatenated and would make printing fail. - Added: multi material plates selection for the RF50 printers, right now only textured PEI and smooth high temp plates are available, but in the future more to come. - Naming consistancy for Blocks Pro S100 processes and filaments, target labels used bare `@Blocks` while RD50 and RF50 used `@Blocks_RD50` and `@Blocks_RF50`. Renamed Pro S100 to `@Blocks_Pro_S100` to match the structure. - Filament restructure: replaced Blocks tuned-generic filaments (e.g. `Generic PLA @Blocks`) with real Blocks-branded filaments. One for each printer model. Every material keeps the same coverage we already had. - Fix: `sparse_infill_pattern` was misspelled `sparse_infill_patter` on 13 `@Blocks_RF50` process presets. Harmless due to inheritances but fixed non the less. - Fix: `Blocks RD50 V2 0.4 nozzle.json` was missing `printer_variant`. - Normalize all Blocks profiles to standard formatting (tab indentation, key order) and bumped `Blocks.json` version. - RF50 retraction length increased on all RF50 machines. ## Tests - [x] `orca_profile_tool.py check --vendor Blocks` - clean - [x] `orca_profile_tool.py check` - clean - [x] `normalize` / `generate-id` / `update-index --dry-run` — fully settled, no pending changes - [x] `check_profile.sh --vendor Blocks` → `profile_tool` check — passes - [ ] `validate_system` / `validate_slice` / `validate_filament_subtypes` / `validate_custom` — could not run locally (dev host's glibc 2.36 is older than the nightly validator binary's required 2.38); needs CI or a compatible host - [x] In-app confirmation that the Blocks bundle loads <!-- > A guide for users on how to download the artifacts from this PR. --> [How to Download Pull Requests Artifacts for Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)	2026-09-28 17:16:55 +08:00