From d86750942b40f48391c1d6380ff28bdfec2e5cd9 Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:10:10 +0200
Subject: [PATCH 1/3] Various corrections to the profile. PP-488 was lost in
 one of the merges. This is now restored. Cleanup of unused global quality
 files and removal of infill_pattern in the solid intent profiles (redundant).
 Added fan number to Method extruders.

---
 .../ultimaker_method_extruder_left.def.json       |  1 +
 .../ultimaker_method_extruder_right.def.json      |  1 +
 ..._f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg |  4 +---
 .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg  |  1 -
 ...thod_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg |  1 -
 .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg  |  1 -
 ...od_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg |  1 -
 ...um_method_labs_um-pla-175_0.2mm_solid.inst.cfg |  1 -
 .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg |  1 -
 .../um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg |  1 -
 ...hodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg |  1 -
 .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg |  1 -
 ...um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg |  1 -
 ...m_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg |  1 -
 ...dx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg |  1 -
 ...m_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg |  1 -
 ...um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg |  1 -
 ...um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg |  1 -
 ...odxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg |  1 -
 ...um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg |  1 -
 ...m_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg |  1 -
 ..._methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg |  1 -
 ...xl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg |  1 -
 ..._methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg |  1 -
 .../um_method_global_Normal_Quality.inst.cfg      | 15 ---------------
 25 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg

diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json
index cb8e86a33b..44680a3468 100644
--- a/resources/extruders/ultimaker_method_extruder_left.def.json
+++ b/resources/extruders/ultimaker_method_extruder_left.def.json
@@ -14,6 +14,7 @@
             "default_value": 0,
             "maximum_value": 1
         },
+        "machine_extruder_cooling_fan_number": { "default_value": 0 },
         "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
         "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" },
         "machine_extruder_start_code_duration": { "default_value": 8 },
diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json
index 520d8abae8..75eb50bdd8 100644
--- a/resources/extruders/ultimaker_method_extruder_right.def.json
+++ b/resources/extruders/ultimaker_method_extruder_right.def.json
@@ -14,6 +14,7 @@
             "default_value": 1,
             "maximum_value": 1
         },
+        "machine_extruder_cooling_fan_number": { "default_value": 1 },
         "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
         "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" },
         "machine_extruder_start_code_duration": { "default_value": 8 },
diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg
index 9dd0190dbc..0aa1fc3d6d 100644
--- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-build_volume_temperature = 35
 jerk_print = 30
-material_bed_temperature = =default_material_bed_temperature + 5
-material_print_temperature = =default_material_print_temperature + 15
+material_print_temperature = =default_material_print_temperature + 10
 speed_print = 80
 wall_thickness = =line_width * 3
 
diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg
index 09767ce8a7..fdfbe77c33 100644
--- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ variant = 1A
 
 [values]
 build_volume_temperature = 47
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
index 17b29cbbef..231cf74ea3 100644
--- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -12,6 +12,5 @@ type = intent
 variant = 1C
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg
index 3d5fa82b7a..87cc96fb5a 100644
--- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ variant = 1C
 
 [values]
 build_volume_temperature = 47
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
index fe2f11dac9..4a05977a4e 100644
--- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -12,6 +12,5 @@ type = intent
 variant = LABS
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg
index 05a61d6b82..6c9d832805 100644
--- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ variant = LABS
 
 [values]
 build_volume_temperature = 47
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg
index 5375e81138..2087c38cba 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ variant = 1A
 
 [values]
 build_volume_temperature = 47
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg
index aa04992d12..3a1c0340fa 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ type = intent
 variant = 1C
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
index 2a6f009282..021e1de2e1 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -12,6 +12,5 @@ type = intent
 variant = 1C
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg
index 7164ec03e8..330811df73 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ variant = 1C
 
 [values]
 build_volume_temperature = 47
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg
index 7d1ead2caf..f4029c6c1d 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ type = intent
 variant = 1XA
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg
index 9020c8fdcc..0a10d33053 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ type = intent
 variant = LABS
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
index 13ff5b5b67..224e85f1af 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -12,6 +12,5 @@ type = intent
 variant = LABS
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg
index 271a651e20..2a672307bb 100644
--- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ variant = LABS
 
 [values]
 build_volume_temperature = 47
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg
index ce3c938e8c..52b091486e 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,7 +13,6 @@ variant = 1A
 
 [values]
 build_volume_temperature = 45
-infill_pattern = lines
 infill_sparse_density = 100
 material_bed_temperature = 45
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg
index e5ad1ab92c..c0d0816b3d 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ type = intent
 variant = 1C
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
index 1f6aad371a..0440ceb055 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -12,6 +12,5 @@ type = intent
 variant = 1C
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg
index 2ac7cdd32a..ce45abad85 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,7 +13,6 @@ variant = 1C
 
 [values]
 build_volume_temperature = 45
-infill_pattern = lines
 infill_sparse_density = 100
 material_bed_temperature = 45
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg
index 5dd7ea0eb8..c0f3cce227 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ type = intent
 variant = 1XA
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg
index 3655b78cf1..bbad6fef50 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg
@@ -13,6 +13,5 @@ type = intent
 variant = LABS
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
index 0322b30164..4fa2252da3 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -12,6 +12,5 @@ type = intent
 variant = LABS
 
 [values]
-infill_pattern = lines
 infill_sparse_density = 100
 
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg
index 242d166473..d5ea2ac7f0 100644
--- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg
@@ -13,7 +13,6 @@ variant = LABS
 
 [values]
 build_volume_temperature = 45
-infill_pattern = lines
 infill_sparse_density = 100
 material_bed_temperature = 45
 
diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg
deleted file mode 100644
index b1304e3b14..0000000000
--- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-definition = ultimaker_method
-name = Fine
-version = 4
-
-[metadata]
-global_quality = True
-quality_type = normal
-setting_version = 23
-type = quality
-weight = 0
-
-[values]
-layer_height = 0.1
-

From 9146304e9a7b450ea0d1d8d2c532b95206847648 Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Tue, 9 Jul 2024 10:38:24 +0200
Subject: [PATCH 2/3] Set z_seam on vertex to false (allow on mid vertex).
 Results in a better seam quality. Also prevent seams on overhangs by default.

PP-495
---
 resources/definitions/fdmprinter.def.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 64196b9f8b..045bec05a4 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1347,7 +1347,7 @@
                     "label": "Z Seam On Vertex",
                     "description": "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)",
                     "type": "bool",
-                    "default_value": true,
+                    "default_value": false,
                     "settable_per_mesh": true,
                     "enabled": "z_seam_type == 'back' or z_seam_type == 'shortest'"
                 },
@@ -8275,7 +8275,7 @@
                     "minimum_value_warning": "2",
                     "maximum_value": "90",
                     "default_value": 90,
-                    "value": "wall_overhang_angle",
+                    "value": "support_angle",
                     "settable_per_mesh": true
                 },
                 "wall_overhang_speed_factor":

From b937f8a7c299378526d86fc47e429db30bc29b82 Mon Sep 17 00:00:00 2001
From: rburema <rburema@users.noreply.github.com>
Date: Tue, 9 Jul 2024 09:03:18 +0000
Subject: [PATCH 3/3] Applied printer-linter format

---
 resources/definitions/Mark2_for_Ultimaker2.def.json | 8 ++++----
 resources/definitions/dxu.def.json                  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json
index 2eedb7ef20..789d5d42ec 100644
--- a/resources/definitions/Mark2_for_Ultimaker2.def.json
+++ b/resources/definitions/Mark2_for_Ultimaker2.def.json
@@ -67,13 +67,13 @@
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x":
         {
-            "value": 105.0,
-            "enabled": false
+            "enabled": false,
+            "value": 105.0
         },
         "layer_start_y":
         {
-            "value": 27.0,
-            "enabled": false
+            "enabled": false,
+            "value": 27.0
         },
         "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
         "machine_acceleration": { "default_value": 3000 },
diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json
index 602098aa05..c5eb9720f3 100644
--- a/resources/definitions/dxu.def.json
+++ b/resources/definitions/dxu.def.json
@@ -52,13 +52,13 @@
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x":
         {
-            "value": 180.0,
-            "enabled": false
+            "enabled": false,
+            "value": 180.0
         },
         "layer_start_y":
         {
-            "value": 160.0,
-            "enabled": false
+            "enabled": false,
+            "value": 160.0
         },
         "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
         "machine_acceleration": { "default_value": 3000 },