Restore Plugin HTML After a WebKit Reload

Plugin dialog content is injected with SetPage, so on the WebKit backends a
reload (context menu, keyboard shortcut or location.reload()) re-fetches the
SetPage base URL instead of the injected document, and the plugin UI is gone
for good: load_plugin_content() returned early once m_content_loaded was set.

Re-inject the plugin HTML when a main-frame load after the initial swap is
neither that swap nor a page the plugin linked to. m_own_page_load marks the
load our own SetPage caused, and the URL test recognises the reload: the
injected document and the directory a reload re-fetches both report the base
URL, so a load of any other URL is left alone. The test ignores a fragment the
page navigated to, and undoes the escaping the web view applies to what the
resources path holds.

A load reaching the base URL is not enough on its own, because WebKitGTK reports
a navigation that never committed against the document that stayed and then
finishes that document again: a link to a missing file therefore arrives as a
load of the base URL and reads exactly like a reload. So the re-injection also
requires a navigation to the base URL to have committed, which a reload always
does and a failure never does.

A bootstrap page that cannot be loaded is still not recovered from: WebKitGTK
substitutes a stock error page for it, and that load supersedes the swap
whichever way the swap is ordered around it. The file ships, so this is a
broken-install path; nothing here makes it worse than it already was.

No separate MSW path is needed: wxWebViewEdge ignores the SetPage base URL, so
its documents report about:blank and the test never matches there, and WebView2
reloads NavigateToString content from its own history entry anyway.

.github/workflows/pr-merge-bot.yml

@@ -529,7 +529,7 @@ jobs:
       && github.event_name == 'pull_request_target'
     permissions:
       contents: read
-      pull-requests: write
+      pull-requests: read
       issues: write
     runs-on: ubuntu-latest
     timeout-minutes: 5
@@ -636,7 +636,7 @@ jobs:
       && github.event_name == 'pull_request_target'
     permissions:
       contents: read        # delegatable subtree, for file modes
-      pull-requests: write
+      pull-requests: read
       issues: write         # label + comment
     runs-on: ubuntu-latest
     timeout-minutes: 10

resources/profiles/Creality.json

@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "02.03.02.84",
+	"version": "02.03.02.82",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [

resources/profiles/Creality/filament/Generic PETG @SPARKX i7-all.json

@@ -55,7 +55,7 @@
 		"0"
 	],
 	"filament_max_volumetric_speed": [
-		"8"
+		"12"
 	],
 	"filament_retract_before_wipe": [
 		"100"

resources/profiles/Creality/filament/Generic PLA @SPARKX i7-all.json

@@ -43,19 +43,19 @@
 		"1.75"
 	],
 	"filament_flow_ratio": [
-		"0.95"
+		"0.98"
 	],
 	"filament_is_support": [
 		"0"
 	],
 	"filament_max_volumetric_speed": [
-		"14"
+		"16"
 	],
 	"filament_minimal_purge_on_wipe_tower": [
 		"15"
 	],
 	"filament_retract_before_wipe": [
-		"100%"
+		"nil"
 	],
 	"filament_retract_restart_extra": [
 		"nil"
@@ -67,7 +67,7 @@
 		"nil"
 	],
 	"filament_retraction_minimum_travel": [
-		"2"
+		"nil"
 	],
 	"filament_retraction_speed": [
 		"nil"
@@ -106,10 +106,7 @@
 		"0"
 	],
 	"slow_down_layer_time": [
-		"14"
-	],
-	"slow_down_min_speed": [
-		"20"
+		"8"
 	],
 	"temperature_vitrification": [
 		"110"
@@ -121,7 +118,7 @@
 		"55"
 	],
 	"filament_start_gcode": [
-		";filament start gcode\n"
+		"; Filament gcode\n"
 	],
 	"filament_end_gcode": [
 		"; filament end gcode \n"
@@ -156,7 +153,7 @@
 	"filament_unloading_speed_start": "100",
 	"material_flow_dependent_temperature": "0",
 	"material_flow_temp_graph": "[[0.2,210],[0.6,220]]",
-	"pressure_advance": "0.032",
+	"pressure_advance": "0.12",
 	"support_material_interface_fan_speed": "-1",
 	"compatible_printers": [
 		"Creality SPARKX i7 0.2 nozzle",

resources/profiles/Creality/machine/Creality Ender-3 V4 0.4 nozzle.json

@@ -54,7 +54,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 X20 Y-1 F30000\nG1 Z0.3 F1200\nG1 X100 E10  F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X120 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X125 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X1 Z-0.300\nG1 X4\nG92 E0\nG1 Z1 F1200",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM104 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 X20 Y-1 F30000\nG1 Z0.3 F1200\nG1 X100 E10  F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X120 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X125 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X1 Z-0.300\nG1 X4\nG92 E0\nG1 Z1 F1200",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",

resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json

@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json

@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json

@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json

@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json

@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json

@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1 Max_CFS-C 0.4 nozzle.json

@@ -56,7 +56,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
 	"machine_ptc_exist": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",

resources/profiles/Creality/machine/Creality K1 SE 0.4 nozzle.json

@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails_format": "PNG",

resources/profiles/Creality/machine/Creality K1 SE 0.6 nozzle.json

@@ -57,7 +57,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",

resources/profiles/Creality/machine/Creality K1 SE 0.8 nozzle.json

@@ -57,7 +57,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",

resources/profiles/Creality/machine/Creality K1 SE_CFS-C 0.4 nozzle.json

@@ -55,7 +55,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",

resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json

@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json

@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json

@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [

resources/profiles/Creality/machine/Creality K1C_CFS-C 0.4 nozzle.json

@@ -56,7 +56,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
 	"machine_ptc_exist": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",

resources/profiles/Creality/machine/Creality K1_CFS-C 0.4 nozzle.json

@@ -57,7 +57,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
 	"machine_ptc_exist": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",

resources/profiles/Creality/machine/Creality SPARKX i7 0.2 nozzle.json

@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",

resources/profiles/Creality/machine/Creality SPARKX i7 0.4 nozzle.json

@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",

resources/profiles/Creality/machine/Creality SPARKX i7 0.6 nozzle.json

@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",

resources/profiles/Creality/machine/Creality SPARKX i7 0.8 nozzle.json

@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",

resources/profiles/OrcaArena.json

@@ -1,7 +1,7 @@
 {
 	"name": "Orca Arena Printer",
 	"url": "",
-	"version": "02.04.00.06",
+	"version": "02.04.00.05",
 	"force_update": "0",
 	"description": "Orca Arena configuration files",
 	"machine_model_list": [

resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json

@@ -2,7 +2,7 @@
 	"type": "machine_model",
 	"name": "Orca Arena X1 Carbon",
 	"model_id": "orca_arena_x1c",
-	"url": "https://www.orcaslicer.com",
+	"url": "",
 	"nozzle_diameter": "0.4;0.2;0.6;0.8",
 	"machine_tech": "FFF",
 	"family": "ARENA-3DP",

resources/profiles/OrcaFilamentLibrary.json

@@ -1,6 +1,6 @@
 {
 	"name": "OrcaFilamentLibrary",
-	"version": "02.04.00.09",
+	"version": "02.04.00.08",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @System.json

@@ -3,7 +3,6 @@
 	"name": "DREMC ABS @System",
 	"inherits": "DREMC ABS @base",
 	"from": "system",
-	"setting_id": "gNjISMxTLwQzDrV9",
-	"instantiation": "true",
+	"instantiation": "false",
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @System.json

@@ -3,7 +3,6 @@
 	"name": "DREMC ABS+ @System",
 	"inherits": "DREMC ABS+ @base",
 	"from": "system",
-	"setting_id": "M73sIwcpWv6zpFrb",
-	"instantiation": "true",
+	"instantiation": "false",
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @System.json

@@ -3,7 +3,6 @@
 	"name": "DREMC ASA @System",
 	"inherits": "DREMC ASA @base",
 	"from": "system",
-	"setting_id": "PMulSQ0tYbNyvOYw",
-	"instantiation": "true",
+	"instantiation": "false",
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @System.json

@@ -3,7 +3,6 @@
 	"name": "DREMC ASA CF @System",
 	"inherits": "DREMC ASA CF @base",
 	"from": "system",
-	"setting_id": "ZcipEKAqtBcAm6vR",
-	"instantiation": "true",
+	"instantiation": "false",
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @System.json

@@ -3,7 +3,6 @@
 	"name": "DREMC ASA GF @System",
 	"inherits": "DREMC ASA GF @base",
 	"from": "system",
-	"setting_id": "8J3lt7KlQWcx0VUS",
-	"instantiation": "true",
+	"instantiation": "false",
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @System.json

@@ -3,7 +3,6 @@
 	"name": "DREMC PA12-CF @System",
 	"inherits": "DREMC PA12-CF @base",
 	"from": "system",
-	"setting_id": "jVlZ1KPsA5i8RIED",
-	"instantiation": "true",
+	"instantiation": "false",
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @System.json

@@ -3,7 +3,6 @@
 	"name": "DREMC PET-CF @System",
 	"inherits": "DREMC PET-CF @base",
 	"from": "system",
-	"setting_id": "hal1nPyBF13UL9qB",
-	"instantiation": "true",
+	"instantiation": "false",
 	"compatible_printers": []
 }

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @System.json

@@ -3,8 +3,7 @@
 	"name": "DREMC PETG @System",
 	"inherits": "DREMC PETG @base",
 	"from": "system",
-	"setting_id": "gTGiaBYfymmtlyfG",
-	"instantiation": "true",
+	"instantiation": "false",
 	"filament_max_volumetric_speed": [
 		"20"
 	],

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @System.json

@@ -1,10 +1,9 @@
 {
 	"type": "filament",
 	"name": "DREMC PLA+ HS @System",
-	"inherits": "DREMC PLA+ HS @base",
+	"inherits": "DREMC PLA+ @base",
 	"from": "system",
-	"setting_id": "I0HWhYAZ3ppq91Gx",
-	"instantiation": "true",
+	"instantiation": "false",
 	"filament_max_volumetric_speed": [
 		"22"
 	],

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @System.json

@@ -3,8 +3,7 @@
 	"name": "DREMC PLA+ @System",
 	"inherits": "DREMC PLA+ @base",
 	"from": "system",
-	"setting_id": "fIjHIsFmdDWIM1bf",
-	"instantiation": "true",
+	"instantiation": "false",
 	"filament_max_volumetric_speed": [
 		"18"
 	],

resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @System.json

@@ -3,8 +3,7 @@
 	"name": "DREMC TPU 95A @System",
 	"inherits": "DREMC TPU 95A @base",
 	"from": "system",
-	"setting_id": "AfnFh14wKZsNEaZ1",
-	"instantiation": "true",
+	"instantiation": "false",
 	"filament_max_volumetric_speed": [
 		"6"
 	],

resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate @base.json

@@ -33,15 +33,15 @@
         "210"
     ],
     "hot_plate_temp": [
-        "50"
+        "60"
     ],
     "hot_plate_temp_initial_layer": [
-        "50"
+        "60"
     ],
     "textured_plate_temp": [
-        "50"
+        "60"
     ],
     "textured_plate_temp_initial_layer": [
-        "50"
+        "60"
     ]
 }

src/dev-utils/OrcaSlicer_profile_validator.cpp

@@ -122,19 +122,17 @@ Vec2d printable_area_center(const DynamicPrintConfig &cfg)
 
 // Put the prime tower where the GUI and CLI would before slicing. The config default (x 15, y 220)
 // lies off any bed shallower than the tower, and generation rejects an off-plate tower instead of
-// exporting it. Beside the cube at the bed centre, clear of the edge exclusion strips some beds
-// carry, with a few mm of clearance so the conflict checker never sees the two touch. The cube and
-// the tower's estimated footprint are then pulled inside the printable outline as one rigid pair:
-// moving the tower alone would push it back onto the cube on a narrow bed. Returns that move for
-// the cube.
-Vec2d place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
+// exporting it. Beside the centred cube, clear of the edge exclusion strips some beds carry, then
+// pulled inside the printable outline by the tower's own estimated footprint, with a few mm of
+// clearance so the conflict checker never sees the two touch.
+void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
 {
     const auto *area = cfg.option<ConfigOptionPoints>("printable_area");
     if (area == nullptr || area->values.size() < 3)
-        return Vec2d::Zero();
+        return;
     const WipeTowerFootprint footprint = estimate_wipe_tower_footprint(cfg, resolve_wipe_tower_type(cfg), {0, 1}, cfg.opt_float("layer_height"), 10.);
     if (footprint.depth < EPSILON)
-        return Vec2d::Zero();
+        return;
     const double margin = WIPE_TOWER_MARGIN + footprint.brim_width;
     // The position is the tower's own origin; a rotated tower extends from it in another
     // direction, so place the rotated box's extents rather than the origin.
@@ -145,22 +143,13 @@ Vec2d place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
     const Vec2d       size  = unscale(local.max) - lo;
     Vec2d             pos(center.x() + 5. + margin + 5. - lo.x(), center.y() - size.y() / 2. - lo.y());
     box.translate(Point::new_scale(pos.x(), pos.y()));
-    // A bed too small for the pair keeps the cube at its centre and places the tower alone.
-    const Polygons    bed{Polygon::new_scale(area->values)};
-    const BoundingBox tower = get_extents(box);
-    BoundingBox       pair  = tower;
-    pair.merge(Point::new_scale(center.x() - 5., center.y() - 5.));
-    pair.merge(Point::new_scale(center.x() + 5., center.y() + 5.));
-    const Point       room  = get_extents(bed).size() - Point::new_scale(2. * margin, 2. * margin);
-    const bool        rigid = pair.size().x() < room.x() && pair.size().y() < room.y();
-    const Vec2d       move  = WipeTower::move_box_inside_polygon(rigid ? pair : tower, bed, scaled<coord_t>(margin)).cast<double>();
-    pos += move;
+    const Vec2f move = WipeTower::move_box_inside_polygon(get_extents(box), Polygons{Polygon::new_scale(area->values)}, scaled<coord_t>(margin));
+    pos += move.cast<double>();
     cfg.option<ConfigOptionFloats>("wipe_tower_x", true)->values = {pos.x()};
     cfg.option<ConfigOptionFloats>("wipe_tower_y", true)->values = {pos.y()};
-    return rigid ? move : Vec2d::Zero();
 }
 
-// Slice one cube that switches from filament 1 to filament 2 partway up, so exactly one
+// Slice one centered cube that switches from filament 1 to filament 2 partway up, so exactly one
 // filament change fires, then export. The change drives the printer's own change_filament_gcode: on a
 // single-nozzle machine it rides the AMS prime tower (append_tcr), on a multi-nozzle machine it routes
 // through the nozzle swap (set_extruder / append_tcr2) - the engine picks the path from the printer's
@@ -168,10 +157,10 @@ Vec2d place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
 // Slic3r::PlaceholderParserError from export.
 std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl)
 {
-    const Vec2d center   = printable_area_center(cfg);
-    const Vec2d cube_min = center - Vec2d(5., 5.) + place_wipe_tower(cfg, center);
+    const Vec2d center = printable_area_center(cfg);
+    place_wipe_tower(cfg, center);
     TriangleMesh m = make_cube(10, 10, 10);
-    m.translate(static_cast<float>(cube_min.x()), static_cast<float>(cube_min.y()), 0.f);
+    m.translate(float(center.x() - 5.), float(center.y() - 5.), 0.f);
 
     Model  model;
     Print  print;