Fix multiple issues with profiles

That's what you get from not having tests running remote.

12 files changed, 9 insertions, 21 deletions

diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json
index 55f2f1611e..68498db423 100644
--- a/resources/definitions/Mark2_for_Ultimaker2.def.json
+++ b/resources/definitions/Mark2_for_Ultimaker2.def.json
@@ -162,10 +162,6 @@
         {
             "default_value": true
         },
-        "jerk_print":
-        {
-            "default_value": 12
-        },
         "jerk_travel":
         {
             "value": "jerk_print if magic_spiralize else 20"
diff --git a/resources/definitions/elegoo_neptune_2.def.json b/resources/definitions/elegoo_neptune_2.def.json
index 76dc16aec4..8e564289f5 100644
--- a/resources/definitions/elegoo_neptune_2.def.json
+++ b/resources/definitions/elegoo_neptune_2.def.json
@@ -38,7 +38,6 @@
         "raft_airgap":{"default_value": 0.25},
         "brim_width":{"default_value": 5},
         "skin_angles":{"default_value": [45, 135]},
-        "infill_pattern":{"default_value": "gyroid"},
         "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_start_gcode": {"default_value": ";simage\n;gimage\nG28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X1.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up"},
         "machine_end_gcode": {"default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z"}
diff --git a/resources/definitions/elegoo_neptune_2D.def.json b/resources/definitions/elegoo_neptune_2D.def.json
index ede0eb166c..78e87d6f40 100644
--- a/resources/definitions/elegoo_neptune_2D.def.json
+++ b/resources/definitions/elegoo_neptune_2D.def.json
@@ -32,10 +32,10 @@
         "machine_extruders_share_nozzle": {"default_value": true},
         "machine_always_write_active_tool": {"default_value": true},
         "prime_blob_enable": {"default_value": false},
-    "prime_tower_enable": {"default_value": true},
-    "prime_tower_size": {"default_value": 30},
-    "prime_tower_min_volume": {"default_value": 90},
-    "speed_print": { "value": 60.0 },
+        "prime_tower_enable": {"default_value": true},
+        "prime_tower_size": {"default_value": 30},
+        "prime_tower_min_volume": {"default_value": 90},
+        "speed_print": { "value": 60.0 },
         "z_seam_type":{"default_value": "back"},
         "z_seam_corner":{"default_value": "z_seam_corner_weighted"},
         "material_standby_temperature":{"default_value": 200,"settable_per_extruder": false},
@@ -46,8 +46,7 @@
         "raft_margin":{"default_value": 5},
         "raft_airgap":{"default_value": 0.25},
         "brim_width":{"default_value": 5},
-    "skin_angles":{"default_value": [45, 135]},
-    "infill_pattern":{"default_value": "gyroid"},
+        "skin_angles":{"default_value": [45, 135]},
         "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_start_gcode": {"default_value": ";simage\n;gimage\nG28 ;home\n;G29 ;Run ABL\n;M420 S1 ;Enable ABL mesh\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X2.0 Y20 Z0.28 F5000.0 ;Move to start position\nG1 E90 F1200 ;Load filament\nG92 E0 ;Reset Extruder\nG1 X2.0 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X2.3 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X2.3 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up"},
         "machine_end_gcode": {"default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-80 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z"}
diff --git a/resources/extruders/elegoo_neptune2D_extruder_0.def.json b/resources/extruders/elegoo_neptune2D_extruder_0.def.json
index 3c4b0ad64b..ad8dee15e8 100644
--- a/resources/extruders/elegoo_neptune2D_extruder_0.def.json
+++ b/resources/extruders/elegoo_neptune2D_extruder_0.def.json
@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "elegoo_neptune_2",
+        "machine": "elegoo_neptune_2D",
         "position": "0"
     },
 
diff --git a/resources/extruders/elegoo_neptune2D_extruder_1.def.json b/resources/extruders/elegoo_neptune2D_extruder_1.def.json
index 7b633cf0d4..f4ec5194c4 100644
--- a/resources/extruders/elegoo_neptune2D_extruder_1.def.json
+++ b/resources/extruders/elegoo_neptune2D_extruder_1.def.json
@@ -3,8 +3,8 @@
     "name": "Extruder 2",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "elegoo_neptune_2",
-        "position": "0"
+        "machine": "elegoo_neptune_2D",
+        "position": "1"
     },
 
     "overrides": {
diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg
index 8059065638..92a592c198 100644
--- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg
+++ b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg
@@ -32,7 +32,6 @@ speed_travel_layer_0 = 125.0
 speed_wall_x = 50.0
 top_bottom_thickness = =layer_height_0+layer_height*3
 top_layers = =0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))
-travel_compensate_overlapping_walls_0_enabled = True
 wall_0_material_flow = 95
 wall_0_wipe_dist = 0.4
 wall_thickness = 1.2
diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg
index ea2ed7694e..afaa645b3e 100644
--- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg
+++ b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg
@@ -28,7 +28,6 @@ speed_layer_0 = 25.0
 speed_travel_layer_0 = 125.0
 speed_wall_x = 50.0
 top_bottom_thickness = 1
-travel_compensate_overlapping_walls_0_enabled = True
 wall_0_material_flow = 95
 wall_0_wipe_dist = 0.4
 wall_thickness = 1.2
diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg
index c43de670d1..bf9c8b8445 100644
--- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg
+++ b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg
@@ -35,7 +35,6 @@ speed_travel_layer_0 = 125.0
 speed_wall_x = 50.0
 support_xy_distance = 0.2
 top_bottom_thickness = 1
-travel_compensate_overlapping_walls_0_enabled = True
 wall_0_inset = 0.2
 wall_0_material_flow = 95
 wall_0_wipe_dist = 0.4
diff --git a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg
index 16cb188d69..0a5b076baa 100644
--- a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg
+++ b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg
@@ -32,7 +32,6 @@ speed_travel_layer_0 = 125.0
 speed_wall_x = 50.0
 top_bottom_thickness = =layer_height_0+layer_height*3
 top_layers = =0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))
-travel_compensate_overlapping_walls_0_enabled = True
 wall_0_material_flow = 95
 wall_0_wipe_dist = 0.4
 wall_thickness = 1.2
diff --git a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg
index 790cc7aced..7fb24a1a41 100644
--- a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg
+++ b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg
@@ -28,7 +28,6 @@ speed_layer_0 = 25.0
 speed_travel_layer_0 = 125.0
 speed_wall_x = 50.0
 top_bottom_thickness = 1
-travel_compensate_overlapping_walls_0_enabled = True
 wall_0_material_flow = 95
 wall_0_wipe_dist = 0.4
 wall_thickness = 1.2
diff --git a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg
index 8b09145c1b..2ed5c6ad76 100644
--- a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg
+++ b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg
@@ -35,7 +35,6 @@ speed_travel_layer_0 = 125.0
 speed_wall_x = 50.0
 support_xy_distance = 0.2
 top_bottom_thickness = 1
-travel_compensate_overlapping_walls_0_enabled = True
 wall_0_inset = 0.2
 wall_0_material_flow = 95
 wall_0_wipe_dist = 0.4
diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt b/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt
index 89f09b6a8c..89209e16f0 100644
--- a/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt
+++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt
@@ -5,7 +5,7 @@ definition = jgaurora_a6
 
 [metadata]
 quality_type = fast
-setting_version = 19
+setting_version = 20
 type = quality
 weight = -4
 global_quality = true