From 8a39389186b122bfb9a1565aa510166bb479e385 Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:22:34 +0200
Subject: [PATCH 1/3] Rebased on top of Cura 5.9

PP-533
---
 .../definitions/ultimaker_method_base.def.json   |  5 +++++
 resources/definitions/ultimaker_sketch.def.json  | 16 ++++++++++++++++
 .../definitions/ultimaker_sketch_sprint.def.json |  3 ++-
 .../um_method_1a_um-petg-175_0.2mm.inst.cfg      |  1 -
 .../um_method_1a_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 .../um_method_1c_um-petg-175_0.2mm.inst.cfg      |  1 -
 .../um_method_1c_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 ..._labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg |  6 ++----
 ...bs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg |  6 ++++++
 .../um_method_labs_um-petg-175_0.2mm.inst.cfg    |  1 -
 ...m_method_labs_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 .../um_methodx_1a_um-petg-175_0.2mm.inst.cfg     |  1 -
 ...um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 .../um_methodx_1c_um-petg-175_0.2mm.inst.cfg     |  1 -
 ...um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 ..._labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg |  6 ++----
 ...bs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg |  6 ++++++
 .../um_methodx_labs_um-petg-175_0.2mm.inst.cfg   |  1 -
 ..._methodx_labs_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 .../um_methodxl_1a_um-petg-175_0.2mm.inst.cfg    |  1 -
 ...m_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 .../um_methodxl_1c_um-petg-175_0.2mm.inst.cfg    |  1 -
 ...m_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 ...bs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg |  6 ++++++
 .../um_methodxl_labs_um-petg-175_0.2mm.inst.cfg  |  1 -
 ...methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg |  4 +---
 26 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
index 6dea197f18..48dfc3dc23 100644
--- a/resources/definitions/ultimaker_method_base.def.json
+++ b/resources/definitions/ultimaker_method_base.def.json
@@ -342,6 +342,11 @@
         "multiple_mesh_overlap": { "value": 0 },
         "optimize_wall_printing_order": { "value": true },
         "prime_blob_enable": { "enabled": false },
+        "prime_tower_enable":
+        {
+            "default_value": "extruders_enabled_count > 1",
+            "enabled": "extruders_enabled_count > 1"
+        },
         "prime_tower_flow": { "value": "material_flow" },
         "prime_tower_line_width":
         {
diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json
index ee753d0eaa..b9353cc7bb 100644
--- a/resources/definitions/ultimaker_sketch.def.json
+++ b/resources/definitions/ultimaker_sketch.def.json
@@ -126,8 +126,23 @@
         "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
         "machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" },
         "machine_width": { "default_value": 150 },
+        "material_bed_temperature":
+        {
+            "maximum_value": 100,
+            "maximum_value_warning": 70
+        },
+        "material_bed_temperature_layer_0":
+        {
+            "maximum_value": 100,
+            "maximum_value_warning": 70
+        },
         "material_diameter": { "default_value": 1.75 },
         "material_flow": { "default_value": 100 },
+        "material_print_temperature":
+        {
+            "maximum_value": 240,
+            "maximum_value_warning": 230
+        },
         "min_bead_width":
         {
             "minimum_value": "line_width * 0.5",
@@ -148,6 +163,7 @@
             "enabled": true,
             "value": "resolveOrValue('print_sequence') != 'one_at_a_time'"
         },
+        "print_sequence": { "enabled": false },
         "raft_margin": { "value": "5" },
         "retract_at_layer_change": { "value": true },
         "retraction_amount":
diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json
index fac4a8f75f..cc03781c00 100644
--- a/resources/definitions/ultimaker_sketch_sprint.def.json
+++ b/resources/definitions/ultimaker_sketch_sprint.def.json
@@ -171,11 +171,12 @@
         "material_flow": { "default_value": 100 },
         "material_print_temperature":
         {
-            "maximum_value": 280,
+            "maximum_value": 260,
             "maximum_value_warning": 240
         },
         "min_bead_width": { "value": 0.3 },
         "multiple_mesh_overlap": { "value": "0" },
+        "print_sequence": { "enabled": false },
         "raft_airgap": { "value": 0.35 },
         "raft_base_acceleration": { "value": "acceleration_layer_0" },
         "raft_base_speed":
diff --git a/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg
index f6b18d4da5..1305ad72b3 100644
--- a/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_1a_um-petg-175_0.2mm.inst.cfg
@@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg
index f79fe83fb9..06f6d7fe4d 100644
--- a/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_1a_um-tough-pla-175_0.2mm.inst.cfg
@@ -56,8 +56,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -65,7 +64,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg
index 6ca8ebc768..2c975a2d6c 100644
--- a/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_1c_um-petg-175_0.2mm.inst.cfg
@@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg
index 52a7cff2e0..7b88cb5659 100644
--- a/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_1c_um-tough-pla-175_0.2mm.inst.cfg
@@ -56,8 +56,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -65,7 +64,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
index 501facd1a8..11a738ba81 100644
--- a/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
@@ -23,15 +23,13 @@ initial_layer_line_width_factor = 110
 layer_height_0 = =layer_height * 1.5
 material_flow_layer_0 = 110
 material_initial_print_temperature = 245
-retraction_amount = 1.5
-retraction_speed = 45
+retraction_amount = 0.75
+retraction_speed = 5
 roofing_line_width = 0.4
 skin_line_width = 0.45
 skin_material_flow_layer_0 = 110
 skin_overlap = 20.0
-skirt_brim_line_width = 1
 skirt_brim_minimal_length = 100.0
-skirt_height = 3
 speed_print = 25
 support_enable = False
 top_bottom_thickness = =layer_height * 2
diff --git a/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
index af34079d70..2aafe1c406 100644
--- a/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
@@ -15,8 +15,14 @@ weight = -2
 [values]
 infill_sparse_density = 50
 raft_airgap = 0.22
+raft_interface_flow = 110
+raft_interface_infill_overlap = 25
 raft_interface_speed = =speed_print * 1/2
+raft_interface_z_offset = -0.1
+raft_surface_flow = 110
+raft_surface_infill_overlap = 50
 raft_surface_speed = =speed_print * 1/2
+raft_surface_z_offset = -0.075
 speed_layer_0 = =speed_print * 1/4
 speed_prime_tower = =speed_print * 3/4
 speed_print = 40
diff --git a/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg
index 83d160323c..3e41c54e58 100644
--- a/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_labs_um-petg-175_0.2mm.inst.cfg
@@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg
index 3a804d10e3..4690f604cb 100644
--- a/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_method/um_method_labs_um-tough-pla-175_0.2mm.inst.cfg
@@ -56,8 +56,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -65,7 +64,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg
index 694fa5499b..67b23523d2 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-petg-175_0.2mm.inst.cfg
@@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg
index 834ef7ce14..bedd1290e0 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-tough-pla-175_0.2mm.inst.cfg
@@ -56,8 +56,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -65,7 +64,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg
index 8a6fb0320d..a506338aa4 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-petg-175_0.2mm.inst.cfg
@@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg
index 36c1f99bf2..618b9c1d21 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-tough-pla-175_0.2mm.inst.cfg
@@ -56,8 +56,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -65,7 +64,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
index 2b17449bb6..f4d0774751 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_labs_basf-ultrafuse-316l-175_0.15mm.inst.cfg
@@ -23,15 +23,13 @@ initial_layer_line_width_factor = 110
 layer_height_0 = =layer_height * 1.5
 material_flow_layer_0 = 110
 material_initial_print_temperature = 245
-retraction_amount = 1.5
-retraction_speed = 45
+retraction_amount = 0.75
+retraction_speed = 5
 roofing_line_width = 0.4
 skin_line_width = 0.45
 skin_material_flow_layer_0 = 110
 skin_overlap = 20.0
-skirt_brim_line_width = 1
 skirt_brim_minimal_length = 100.0
-skirt_height = 3
 speed_print = 25
 support_enable = False
 top_bottom_thickness = =layer_height * 2
diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
index a1366e7eec..c4f6a71694 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
@@ -15,8 +15,14 @@ weight = -2
 [values]
 infill_sparse_density = 50
 raft_airgap = 0.22
+raft_interface_flow = 110
+raft_interface_infill_overlap = 25
 raft_interface_speed = =speed_print * 1/2
+raft_interface_z_offset = -0.1
+raft_surface_flow = 110
+raft_surface_infill_overlap = 50
 raft_surface_speed = =speed_print * 1/2
+raft_surface_z_offset = -0.075
 speed_layer_0 = =speed_print * 1/4
 speed_prime_tower = =speed_print * 3/4
 speed_print = 40
diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg
index 0caa760547..0c364346e5 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-petg-175_0.2mm.inst.cfg
@@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg
index 006f929acb..4f131c9b15 100644
--- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-tough-pla-175_0.2mm.inst.cfg
@@ -56,8 +56,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -65,7 +64,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg
index 1c51fb895d..4b78e76ca1 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-petg-175_0.2mm.inst.cfg
@@ -34,7 +34,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg
index a8a877007b..8efec8ddd1 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-tough-pla-175_0.2mm.inst.cfg
@@ -54,8 +54,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -63,7 +62,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg
index aed6b809dc..48a5754baf 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-petg-175_0.2mm.inst.cfg
@@ -34,7 +34,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg
index adcb34d9ca..505dc59efc 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-tough-pla-175_0.2mm.inst.cfg
@@ -54,8 +54,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -63,7 +62,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
index 5fff8ce1fb..30d455ccce 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_jabil-tpe-sebs-1300-95a-175_0.2mm.inst.cfg
@@ -15,8 +15,14 @@ weight = -2
 [values]
 infill_sparse_density = 50
 raft_airgap = 0.22
+raft_interface_flow = 110
+raft_interface_infill_overlap = 25
 raft_interface_speed = =speed_print * 1/2
+raft_interface_z_offset = -0.1
+raft_surface_flow = 110
+raft_surface_infill_overlap = 50
 raft_surface_speed = =speed_print * 1/2
+raft_surface_z_offset = -0.075
 speed_layer_0 = =speed_print * 1/4
 speed_prime_tower = =speed_print * 3/4
 speed_print = 40
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg
index 69c62ca3f2..6e5bcf5206 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-petg-175_0.2mm.inst.cfg
@@ -34,7 +34,6 @@ raft_surface_infill_overlap = 25
 raft_surface_line_spacing = 0.425
 raft_surface_line_width = 0.4
 raft_surface_speed = 40
-raft_surface_wall_count = 2
 skin_overlap = 10
 speed_layer_0 = 15
 speed_print = 60
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg
index 631fae2fe3..e9254988a5 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-tough-pla-175_0.2mm.inst.cfg
@@ -54,8 +54,7 @@ support_bottom_enable = False
 support_infill_angles = [45 ]
 support_infill_rate = 12
 support_interface_density = 75
-support_interface_height = =layer_height * 4
-support_interface_material_flow = =material_flow * 0.9
+support_interface_material_flow = =support_material_flow
 support_interface_offset = 0.8
 support_interface_pattern = zigzag
 support_line_width = =line_width * 0.75
@@ -63,7 +62,6 @@ support_material_flow = =material_flow * 0.9
 support_offset = 1
 support_pattern = zigzag
 support_roof_density = =support_interface_density
-support_roof_height = =layer_height * 4
 support_roof_line_width = =line_width
 support_top_distance = =support_z_distance
 support_xy_distance = 0.35

From ba77d0fcbc5f85d40a3e741bbefcabb356d5d68b Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Fri, 18 Oct 2024 11:43:19 +0200
Subject: [PATCH 2/3] Turn on prime tower by default for the Method machines
 (if > 1 extruders)

---
 resources/definitions/ultimaker_method_base.def.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
index 48dfc3dc23..8147b432ca 100644
--- a/resources/definitions/ultimaker_method_base.def.json
+++ b/resources/definitions/ultimaker_method_base.def.json
@@ -344,8 +344,7 @@
         "prime_blob_enable": { "enabled": false },
         "prime_tower_enable":
         {
-            "default_value": "extruders_enabled_count > 1",
-            "enabled": "extruders_enabled_count > 1"
+            "default_value": true
         },
         "prime_tower_flow": { "value": "material_flow" },
         "prime_tower_line_width":
@@ -595,4 +594,4 @@
         "z_seam_type": { "value": "'sharpest_corner'" },
         "zig_zaggify_infill": { "value": true }
     }
-}
\ No newline at end of file
+}

From d7d25d04325487cbc2d2c27a33e644641b420834 Mon Sep 17 00:00:00 2001
From: pkuiper-ultimaker <pkuiper-ultimaker@users.noreply.github.com>
Date: Fri, 18 Oct 2024 09:44:30 +0000
Subject: [PATCH 3/3] Applied printer-linter format

---
 resources/definitions/ultimaker_method_base.def.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
index 8147b432ca..2f21c4efe0 100644
--- a/resources/definitions/ultimaker_method_base.def.json
+++ b/resources/definitions/ultimaker_method_base.def.json
@@ -342,10 +342,7 @@
         "multiple_mesh_overlap": { "value": 0 },
         "optimize_wall_printing_order": { "value": true },
         "prime_blob_enable": { "enabled": false },
-        "prime_tower_enable":
-        {
-            "default_value": true
-        },
+        "prime_tower_enable": { "default_value": true },
         "prime_tower_flow": { "value": "material_flow" },
         "prime_tower_line_width":
         {
@@ -594,4 +591,4 @@
         "z_seam_type": { "value": "'sharpest_corner'" },
         "zig_zaggify_infill": { "value": true }
     }
-}
+}
\ No newline at end of file