Revert "Auto generated print profiles. They settings will be reordered and some of the profile names have changed with the "" - Experimental" tag if the isExperimental flag was set."

This reverts commit 4785371f26.

resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg

@@ -20,10 +20,10 @@ ooze_shield_angle = 40
 raft_airgap = 0.4
 retraction_min_travel = 5
 skin_overlap = 50
-speed_layer_0 = 10
 speed_print = 70
 speed_topbottom = =math.ceil(speed_print * 30 / 70)
 speed_wall = =math.ceil(speed_print * 30 / 70)
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
+speed_layer_0 = 10

resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg

@@ -11,6 +11,7 @@ weight = 0
 material = generic_pc
 variant = AA 0.25
 is_experimental = True
+
 [values]
 brim_width = 20
 cool_fan_full_at_height = =layer_height_0 + layer_height

resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg

@@ -12,9 +12,10 @@ material = generic_petg
 variant = AA 0.25
 
 [values]
-initial_layer_line_width_factor = 100
-material_print_temperature = =default_material_print_temperature - 5
 retraction_combing_max_distance = 8
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
+initial_layer_line_width_factor = 100
+
+material_print_temperature = =default_material_print_temperature - 5

resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg

@@ -11,6 +11,7 @@ weight = 0
 material = generic_pp
 variant = AA 0.25
 is_experimental = True
+
 [values]
 brim_width = 10
 cool_fan_speed_max = 100

resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg

@@ -14,15 +14,16 @@ variant = AA 0.4
 [values]
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
 material_print_temperature = =default_material_print_temperature + 20
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
 prime_tower_enable = False
-raft_airgap = 0.15
 skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = 10
 speed_print = 60
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+speed_infill = =math.ceil(speed_print * 50 / 60)
+
+raft_airgap = 0.15

resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg

@@ -15,14 +15,17 @@ variant = AA 0.4
 cool_min_speed = 7
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
 material_print_temperature = =default_material_print_temperature + 15
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
 prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 45 / 60)
-speed_layer_0 = 10
 speed_print = 60
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+
+speed_infill = =math.ceil(speed_print * 45 / 60)
+
+raft_airgap = 0.15

resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg

@@ -15,13 +15,16 @@ variant = AA 0.4
 cool_min_speed = 12
 machine_nozzle_cool_down_speed = 0.8
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
 material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
 prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = 10
 speed_print = 50
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)
+
+
+speed_infill = =math.ceil(speed_print * 40 / 50)
+
+raft_airgap = 0.15

resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg

@@ -14,13 +14,16 @@ variant = AA 0.4
 [values]
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
 material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
 prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 40 / 55)
-speed_layer_0 = 10
 speed_print = 55
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)
+
+
+speed_infill = =math.ceil(speed_print * 40 / 55)
+
+raft_airgap = 0.15

resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg

@@ -18,16 +18,17 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 5
+# prime_tower_enable: see CURA-4248
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_overlap = 20
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 speed_topbottom = =math.ceil(speed_print * 35 / 70)
 speed_wall = =math.ceil(speed_print * 50 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
-support_interface_density = =min(extruderValues('material_surface_energy'))
-support_interface_enable = True
-support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
 top_bottom_thickness = 1
+support_brim_enable = True
+support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
+support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45

resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg

@@ -12,22 +12,23 @@ material = generic_bam
 variant = AA 0.4
 
 [values]
+support_infill_sparse_thickness = =2*layer_height
 brim_replaces_support = False
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
+# prime_tower_enable: see CURA-4248
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
-speed_layer_0 = =math.ceil(speed_print * 20 / 80)
 speed_print = 80
+speed_layer_0 = =math.ceil(speed_print * 20 / 80)
 speed_topbottom = =math.ceil(speed_print * 30 / 80)
 speed_wall = =math.ceil(speed_print * 40 / 80)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
-support_interface_density = =min(extruderValues('material_surface_energy'))
-support_interface_enable = True
-support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
 top_bottom_thickness = 1
+support_brim_enable = True
+support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
+support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45

resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg

@@ -12,20 +12,21 @@ material = generic_bam
 variant = AA 0.4
 
 [values]
+support_infill_sparse_thickness = =2*layer_height
 brim_replaces_support = False
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 7
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
+# prime_tower_enable: see CURA-4248
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_overlap = 10
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
 support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
-support_interface_density = =min(extruderValues('material_surface_energy'))
 support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
 support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45
 top_bottom_thickness = 1

resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg

@@ -1,16 +1,17 @@
 [general]
 version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
 quality_type = verydraft
-weight = -3
+weight = -2
 material = generic_bam
 variant = AA 0.4
 is_experimental = True
+
 [values]
 brim_replaces_support = False
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
@@ -24,10 +25,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 speed_topbottom = =math.ceil(speed_print * 35 / 70)
 speed_wall = =math.ceil(speed_print * 50 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
-support_angle = 45
-support_bottom_distance = 0.3
-support_brim_enable = True
-support_interface_density = =min(extruderValues('material_surface_energy'))
-support_interface_enable = True
-support_top_distance = 0.3
 top_bottom_thickness = 1
+support_brim_enable = True
+support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
+support_top_distance = 0.3
+support_bottom_distance = 0.3
+support_angle = 45

resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.4
 [values]
 cool_fan_speed_max = 80
 cool_min_speed = 5
+
 infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
@@ -33,6 +34,7 @@ skin_overlap = 20
 speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 40 / 50)
+
 speed_wall = =math.ceil(speed_print * 50 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
 support_z_distance = =layer_height

resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.4
 [values]
 cool_fan_speed_max = 80
 cool_min_speed = 6
+
 infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15
@@ -33,6 +34,7 @@ skin_overlap = 20
 speed_layer_0 = =math.ceil(speed_print * 20 / 45)
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
+
 speed_wall = =math.ceil(speed_print * 45 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
 support_z_distance = =layer_height

resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.4
 [values]
 cool_fan_speed_max = 50
 cool_min_speed = 5
+
 infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15

resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.4
 [values]
 cool_fan_speed_max = 50
 cool_min_speed = 7
+
 infill_overlap = 0
 infill_wipe_dist = 0
 machine_min_cool_heat_time_window = 15

resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg

@@ -12,16 +12,17 @@ material = generic_cpe
 variant = AA 0.4
 
 [values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
 material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 retraction_combing_max_distance = 50
 retraction_prime_speed = =retraction_speed
 skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)

resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg

@@ -13,15 +13,16 @@ variant = AA 0.4
 
 [values]
 cool_min_speed = 7
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
 material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 retraction_combing_max_distance = 50
 retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)

resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg

@@ -13,16 +13,17 @@ variant = AA 0.4
 
 [values]
 cool_min_speed = 12
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
 material_print_temperature = =default_material_print_temperature - 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 retraction_combing_max_distance = 50
 retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg

@@ -12,15 +12,16 @@ material = generic_cpe
 variant = AA 0.4
 
 [values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 retraction_combing_max_distance = 50
 retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 45 / 55)
-speed_layer_0 = =math.ceil(speed_print * 20 / 55)
 speed_print = 55
+speed_layer_0 = =math.ceil(speed_print * 20 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 45 / 55)

resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg

@@ -14,9 +14,9 @@ variant = AA 0.4
 [values]
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
 material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
 raft_airgap = 0.4
 retraction_prime_speed = =retraction_speed
@@ -24,4 +24,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40

resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg

@@ -14,9 +14,9 @@ variant = AA 0.4
 [values]
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
 material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
 raft_airgap = 0.4
 retraction_prime_speed = =retraction_speed
@@ -24,4 +24,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40

resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg

@@ -14,8 +14,8 @@ variant = AA 0.4
 [values]
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 15
-material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
 raft_airgap = 0.4
 retraction_prime_speed = =retraction_speed
@@ -23,4 +23,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40

resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg

@@ -14,8 +14,8 @@ variant = AA 0.4
 [values]
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 12
-material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
 raft_airgap = 0.4
 retraction_prime_speed = =retraction_speed

resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg

@@ -17,6 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + layer_height
 cool_fan_speed_max = 50
 cool_min_layer_time_fan_speed_max = 5
 cool_min_speed = 8
+
 infill_overlap = 0
 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'

resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg

@@ -17,6 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + layer_height
 cool_fan_speed_max = 50
 cool_min_layer_time_fan_speed_max = 5
 cool_min_speed = 5
+
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_wipe_dist = 0.1

resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg

@@ -12,16 +12,17 @@ material = generic_petg
 variant = AA 0.4
 
 [values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
-material_final_print_temperature = =material_print_temperature - 5
-material_initial_print_temperature = =material_print_temperature
 material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature - 5
 retraction_combing_max_distance = 8
 skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
+initial_layer_line_width_factor = 100

resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg

@@ -13,15 +13,16 @@ variant = AA 0.4
 
 [values]
 cool_min_speed = 7
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
 material_print_temperature = =default_material_print_temperature
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
 retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
+initial_layer_line_width_factor = 100

resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg

@@ -13,16 +13,17 @@ variant = AA 0.4
 
 [values]
 cool_min_speed = 12
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 15
-material_initial_print_temperature = =material_print_temperature - 10
 material_print_temperature = =default_material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 10
+material_final_print_temperature = =material_print_temperature - 15
 retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 40 / 50)
+initial_layer_line_width_factor = 100

resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg

@@ -12,16 +12,17 @@ material = generic_petg
 variant = AA 0.4
 
 [values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 15
-material_initial_print_temperature = =material_print_temperature - 10
 material_print_temperature = =default_material_print_temperature - 5
+material_initial_print_temperature = =material_print_temperature - 10
+material_final_print_temperature = =material_print_temperature - 15
 retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 45 / 55)
-speed_layer_0 = =math.ceil(speed_print * 20 / 55)
 speed_print = 55
+speed_layer_0 = =math.ceil(speed_print * 20 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 45 / 55)
+initial_layer_line_width_factor = 100

resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg

@@ -12,17 +12,12 @@ material = generic_pla
 variant = AA 0.4
 
 [values]
-acceleration_wall = 2000
-acceleration_wall_0 = 2000
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
-infill_sparse_density = 15
-layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 5
 prime_tower_enable = False
-raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 skin_overlap = 20
 speed_layer_0 = 10
@@ -30,3 +25,9 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70)
 speed_wall = =math.ceil(speed_print * 55 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 45 / 50)
 top_bottom_thickness = 0.8
+infill_sparse_density = 15
+layer_height_0 = 0.2
+acceleration_wall = 2000
+acceleration_wall_0 = 2000
+
+raft_airgap = 0.25

resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg

@@ -14,15 +14,16 @@ variant = AA 0.4
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
-layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 prime_tower_enable = False
-raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
-speed_layer_0 = 10
 speed_print = 70
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 35 / 70)
 speed_wall = =math.ceil(speed_print * 45 / 70)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 70)
 top_bottom_thickness = 1
+layer_height_0 = 0.2
+
+raft_airgap = 0.25

resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg

@@ -15,16 +15,17 @@ variant = AA 0.4
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 10
-layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature - 5
 prime_tower_enable = False
-raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 skin_overlap = 10
-speed_layer_0 = 10
 speed_print = 50
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 35 / 50)
 top_bottom_thickness = 1
+layer_height_0 = 0.2
+
+raft_airgap = 0.25

resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg

@@ -15,12 +15,13 @@ variant = AA 0.4
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 7
-layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 prime_tower_enable = False
-raft_airgap = 0.25
 retraction_prime_speed = =retraction_speed
 skin_overlap = 10
 speed_layer_0 = 10
 top_bottom_thickness = 1
+layer_height_0 = 0.2
+
+raft_airgap = 0.25

resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg

@@ -1,33 +1,38 @@
 [general]
 version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
 quality_type = verydraft
-weight = -3
+weight = -2
 material = generic_pla
 variant = AA 0.4
 is_experimental = True
+
 [values]
+infill_sparse_density = 15
 acceleration_print = 2000
-acceleration_topbottom = 1000
 acceleration_wall = 1500
 acceleration_wall_0 = 1000
-cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
-cool_fan_speed_max = =cool_fan_speed
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-infill_sparse_density = 15
-machine_nozzle_cool_down_speed = 0.75
-machine_nozzle_heat_up_speed = 1.6
-material_print_temperature = =default_material_print_temperature + 10
-prime_tower_enable = False
-raft_airgap = 0.25
-retraction_prime_speed = =retraction_speed
-skin_overlap = 20
+acceleration_topbottom = 1000
 speed_print = 50
 speed_wall = 50
+
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+
+material_print_temperature = =default_material_print_temperature + 10
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+prime_tower_enable = False
+retraction_prime_speed = =retraction_speed
+skin_overlap = 20
 top_bottom_thickness = 0.9
-wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+
+raft_airgap = 0.25
+wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg

@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 7
 cool_min_speed = 2.5
+
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1

resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg

@@ -40,6 +40,7 @@ retraction_min_travel = 0.8
 speed_layer_0 = =math.ceil(speed_print * 15 / 25)
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 25 / 25)
+
 speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)

resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg

@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 7
 cool_min_speed = 2.5
+
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 infill_wipe_dist = 0.1
@@ -40,6 +41,7 @@ retraction_min_travel = 0.8
 speed_layer_0 = =math.ceil(speed_print * 15 / 25)
 speed_print = 25
 speed_topbottom = =math.ceil(speed_print * 25 / 25)
+
 speed_travel_layer_0 = 50
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)

resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg

@@ -15,16 +15,17 @@ variant = AA 0.4
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 10
-layer_height_0 = 0.2
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature - 15
 prime_tower_enable = False
 retraction_prime_speed = =retraction_speed
 skin_overlap = 10
-speed_layer_0 = =math.ceil(speed_print * 20 / 45)
 speed_print = 45
+speed_layer_0 = =math.ceil(speed_print * 20 / 45)
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
 top_bottom_thickness = 1.2
+layer_height_0 = 0.2
+

resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg

@@ -1,33 +1,38 @@
 [general]
 version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
 quality_type = verydraft
-weight = -3
+weight = -2
 material = generic_tough_pla
 variant = AA 0.4
 is_experimental = True
+
 [values]
+infill_sparse_density = 15
 acceleration_print = 2000
-acceleration_topbottom = 1000
 acceleration_wall = 1500
 acceleration_wall_0 = 1000
-cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
-cool_fan_speed_max = =cool_fan_speed
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-infill_sparse_density = 15
-machine_nozzle_cool_down_speed = 0.75
-machine_nozzle_heat_up_speed = 1.6
-material_print_temperature = =default_material_print_temperature - 5
-prime_tower_enable = False
-raft_airgap = 0.25
-retraction_prime_speed = =retraction_speed
-skin_overlap = 20
+acceleration_topbottom = 1000
 speed_print = 50
 speed_wall = 50
+
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+
+material_print_temperature = =default_material_print_temperature - 5
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+prime_tower_enable = False
+retraction_prime_speed = =retraction_speed
+skin_overlap = 20
 top_bottom_thickness = 1.2
-wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+
+raft_airgap = 0.25
+wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)

resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg

@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 4
 gradual_infill_step_height = =5 * layer_height
+
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10

resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg

@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 4
 gradual_infill_step_height = =5 * layer_height
+
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10

resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg

@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 4
 gradual_infill_step_height = =5 * layer_height
+
 infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 10

resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg

@@ -12,6 +12,7 @@ material = generic_abs
 variant = AA 0.8
 
 [values]
+
 material_print_temperature = =default_material_print_temperature + 20
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 30 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg

@@ -12,9 +12,10 @@ material = generic_abs
 variant = AA 0.8
 
 [values]
+
 material_print_temperature = =default_material_print_temperature + 25
-speed_infill = =math.ceil(speed_print * 37 / 50)
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg

@@ -12,6 +12,7 @@ material = generic_abs
 variant = AA 0.8
 
 [values]
+
 material_print_temperature = =default_material_print_temperature + 22
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 30 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg

@@ -1,19 +1,22 @@
 [general]
 version = 4
-name = Normal - Experimental
+name = Fast - Experimental
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
 material = generic_cpe_plus
 variant = AA 0.8
 is_experimental = True
+
 [values]
 brim_width = 14
 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+
+
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_print_temperature = =default_material_print_temperature - 10

resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg

@@ -11,9 +11,12 @@ weight = -4
 material = generic_cpe_plus
 variant = AA 0.8
 is_experimental = True
+
 [values]
 brim_width = 14
 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
+
+
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_print_temperature = =default_material_print_temperature - 5
@@ -23,12 +26,12 @@ retraction_combing_max_distance = 50
 retraction_hop = 0.1
 retraction_hop_enabled = False
 skin_overlap = 0
-speed_infill = =math.ceil(speed_print * 40 / 50)
 speed_layer_0 = =math.ceil(speed_print * 15 / 50)
 speed_print = 50
 speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 40 / 50)
 support_z_distance = =layer_height
 top_bottom_thickness = 1.2

resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg

@@ -11,9 +11,12 @@ weight = -3
 material = generic_cpe_plus
 variant = AA 0.8
 is_experimental = True
+
 [values]
 brim_width = 14
 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
+
+
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_print_temperature = =default_material_print_temperature - 7

resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg

@@ -13,6 +13,7 @@ variant = AA 0.8
 
 [values]
 brim_width = 15
+
 material_print_temperature = =default_material_print_temperature + 15
 prime_tower_enable = True
 retraction_combing_max_distance = 50

resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg

@@ -13,11 +13,13 @@ variant = AA 0.8
 
 [values]
 brim_width = 15
+
 material_print_temperature = =default_material_print_temperature + 20
 prime_tower_enable = True
 retraction_combing_max_distance = 50
-speed_infill = =math.ceil(speed_print * 33 / 45)
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
 speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+speed_infill = =math.ceil(speed_print * 33 / 45)

resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg

@@ -13,6 +13,7 @@ variant = AA 0.8
 
 [values]
 brim_width = 15
+
 material_print_temperature = =default_material_print_temperature + 17
 prime_tower_enable = True
 retraction_combing_max_distance = 50

resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg

@@ -15,6 +15,8 @@ variant = AA 0.8
 brim_width = 5.6
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
+
+
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40

resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg

@@ -15,6 +15,8 @@ variant = AA 0.8
 brim_width = 5.6
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
+
+
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40

resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg

@@ -15,6 +15,8 @@ variant = AA 0.8
 brim_width = 5.6
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
+
+
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40

resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg

@@ -1,19 +1,22 @@
 [general]
 version = 4
-name = Normal - Experimental
+name = Fast - Experimental
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
 material = generic_pc
 variant = AA 0.8
 is_experimental = True
+
 [values]
 brim_width = 14
 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+
+
 material_print_temperature = =default_material_print_temperature - 5
 material_print_temperature_layer_0 = =material_print_temperature
 raft_airgap = 0.5

resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg

@@ -11,16 +11,19 @@ weight = -4
 material = generic_pc
 variant = AA 0.8
 is_experimental = True
+
 [values]
 brim_width = 14
 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
+
+
 material_print_temperature_layer_0 = =material_print_temperature
 raft_airgap = 0.5
 skin_overlap = 0
-speed_infill = =math.ceil(speed_print * 37 / 50)
 speed_layer_0 = =math.ceil(speed_print * 15 / 50)
 speed_print = 50
 speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
 speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)

resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg

@@ -11,9 +11,12 @@ weight = -3
 material = generic_pc
 variant = AA 0.8
 is_experimental = True
+
 [values]
 brim_width = 14
 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
+
+
 material_print_temperature = =default_material_print_temperature - 2
 material_print_temperature_layer_0 = =material_print_temperature
 raft_airgap = 0.5

resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg

@@ -13,11 +13,12 @@ variant = AA 0.8
 
 [values]
 brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
+
 material_print_temperature = =default_material_print_temperature - 5
 prime_tower_enable = True
 retraction_combing_max_distance = 8
 speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
+cool_fan_speed = 20
+initial_layer_line_width_factor = 100

resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg

@@ -13,13 +13,14 @@ variant = AA 0.8
 
 [values]
 brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
+
 material_print_temperature = =default_material_print_temperature - 5
 prime_tower_enable = True
 retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 33 / 45)
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
 speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
+cool_fan_speed = 20
+initial_layer_line_width_factor = 100

resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg

@@ -13,12 +13,14 @@ variant = AA 0.8
 
 [values]
 brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
-layer_height_0 = 0.27
+
 material_print_temperature = =default_material_print_temperature - 5
 prime_tower_enable = True
 retraction_combing_max_distance = 8
 speed_print = 40
 speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
+cool_fan_speed = 20
+layer_height_0 = 0.27
+initial_layer_line_width_factor = 100
+

resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg

@@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 10
 prime_tower_enable = True
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+layer_height_0 = 0.4

resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg

@@ -16,18 +16,18 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 15
 prime_tower_enable = True
-speed_infill = =math.ceil(speed_print * 35 / 45)
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 35 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 35 / 45)
+layer_height_0 = 0.4

resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg

@@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
 material_print_temperature = =default_material_print_temperature + 10
 prime_tower_enable = True
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+layer_height_0 = 0.4

resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg

@@ -15,6 +15,7 @@ variant = AA 0.8
 brim_width = 25
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature - 2
@@ -33,5 +34,4 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
 top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg

@@ -15,6 +15,7 @@ variant = AA 0.8
 brim_width = 25
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature + 2
@@ -28,11 +29,10 @@ retraction_extra_prime_amount = 0.5
 retraction_hop = 0.5
 retraction_min_travel = 1.5
 retraction_prime_speed = 15
-speed_infill = =math.ceil(speed_wall * 30 / 30)
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_infill = =math.ceil(speed_wall * 30 / 30)
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
 top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg

@@ -15,6 +15,7 @@ variant = AA 0.8
 brim_width = 25
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
@@ -32,5 +33,4 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
 top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.8
 [values]
 brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
@@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
 top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.8
 [values]
 brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.5
@@ -32,16 +33,15 @@ retraction_hop = 1.5
 retraction_hop_only_when_collides = False
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
-speed_infill = =speed_print
 speed_print = 30
 speed_topbottom = =math.ceil(speed_print * 20 / 30)
 speed_wall = =speed_print
 speed_wall_x = =speed_print
+speed_infill = =speed_print
 support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
 top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.8
 [values]
 brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
 infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.5
@@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 45
 top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
 travel_avoid_distance = 1.5
 wall_0_wipe_dist = =line_width * 2

resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg

@@ -13,12 +13,12 @@ variant = BB 0.4
 
 [values]
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 material_print_temperature = =default_material_print_temperature + 10
 prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 20
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg

@@ -12,14 +12,14 @@ material = generic_pva
 variant = BB 0.4
 
 [values]
+support_infill_sparse_thickness = =2*layer_height
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 material_print_temperature = =default_material_print_temperature + 5
 prime_tower_enable = False
 retraction_count_max = 5
 skin_overlap = 15
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg

@@ -12,12 +12,12 @@ material = generic_pva
 variant = BB 0.4
 
 [values]
+support_infill_sparse_thickness = =3*layer_height
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 prime_tower_enable = False
 retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
-support_infill_sparse_thickness = =3*layer_height
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg

@@ -12,12 +12,12 @@ material = generic_pva
 variant = BB 0.4
 
 [values]
+support_infill_sparse_thickness = =2*layer_height
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 prime_tower_enable = False
 retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg

@@ -1,6 +1,6 @@
 [general]
 version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
 definition = ultimaker_s3
 
 [metadata]
@@ -11,12 +11,13 @@ weight = -3
 material = generic_pva
 variant = BB 0.4
 is_experimental = True
+
 [values]
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg

@@ -13,10 +13,10 @@ variant = BB 0.8
 
 [values]
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 material_print_temperature = =default_material_print_temperature + 5
 retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg

@@ -13,9 +13,9 @@ variant = BB 0.8
 
 [values]
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg

@@ -13,10 +13,10 @@ variant = BB 0.8
 
 [values]
 brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
 support_brim_enable = True
 support_infill_sparse_thickness = 0.3
 support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
 support_use_towers = True

resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg

@@ -16,7 +16,9 @@ cool_fan_enabled = True
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 6
+
 initial_layer_line_width_factor = 130.0
+
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
 material_print_temperature = =default_material_print_temperature
 material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg

@@ -7,7 +7,7 @@ definition = ultimaker_s3
 setting_version = 20
 type = quality
 quality_type = fast
-weight = -1
+weight = -2
 material = generic_cffcpe
 variant = CC 0.4
 
@@ -16,7 +16,9 @@ cool_fan_enabled = True
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 6
+
 initial_layer_line_width_factor = 130.0
+
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
 material_print_temperature = =default_material_print_temperature
 material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg

@@ -16,7 +16,9 @@ cool_fan_enabled = True
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 6
+
 initial_layer_line_width_factor = 130.0
+
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
 material_print_temperature = =default_material_print_temperature
 material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg

@@ -7,7 +7,7 @@ definition = ultimaker_s3
 setting_version = 20
 type = quality
 quality_type = fast
-weight = -1
+weight = -2
 material = generic_cffpa
 variant = CC 0.4
 
@@ -16,7 +16,9 @@ cool_fan_enabled = True
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 6
+
 initial_layer_line_width_factor = 130.0
+
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
 material_print_temperature = =default_material_print_temperature
 material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg

@@ -16,7 +16,9 @@ cool_fan_enabled = True
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 6
+
 initial_layer_line_width_factor = 130.0
+
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
 material_print_temperature = =default_material_print_temperature
 material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg

@@ -7,7 +7,7 @@ definition = ultimaker_s3
 setting_version = 20
 type = quality
 quality_type = fast
-weight = -1
+weight = -2
 material = generic_gffcpe
 variant = CC 0.4
 
@@ -16,7 +16,9 @@ cool_fan_enabled = True
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 6
+
 initial_layer_line_width_factor = 130.0
+
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
 material_print_temperature = =default_material_print_temperature
 material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg

@@ -16,7 +16,9 @@ cool_fan_enabled = True
 cool_min_layer_time = 7
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 6
+
 initial_layer_line_width_factor = 130.0
+
 material_bed_temperature_layer_0 = =material_bed_temperature + 5
 material_print_temperature = =default_material_print_temperature
 material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg

@@ -7,7 +7,7 @@ definition = ultimaker_s3
 setting_version = 20
 type = quality
 quality_type = fast
-weight = -1
+weight = -2
 material = generic_gffpa
 variant = CC 0.4
 
@@ -24,3 +24,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg

@@ -1,16 +1,17 @@
 [general]
 version = 4
-name = Fast - Experimental
+name = Fast
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
 quality_type = draft
-weight = -2
+weight = -3
 material = generic_pla
 variant = CC 0.4
 is_experimental = True
+
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg

@@ -1,16 +1,17 @@
 [general]
 version = 4
-name = Normal - Experimental
+name = Normal
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
 quality_type = fast
-weight = -1
+weight = -2
 material = generic_pla
 variant = CC 0.4
 is_experimental = True
+
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg

@@ -24,3 +24,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg

@@ -24,3 +24,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg

@@ -24,3 +24,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg

@@ -24,3 +24,4 @@ skin_overlap = 20
 support_bottom_distance = =support_z_distance / 2
 support_top_distance = =support_z_distance
 support_z_distance = =layer_height * 2
+

resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg

@@ -1,16 +1,17 @@
 [general]
 version = 4
-name = Fast - Experimental
+name = Fast
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
 quality_type = draft
-weight = -2
+weight = -3
 material = generic_pla
 variant = CC 0.6
 is_experimental = True
+
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg

@@ -1,16 +1,17 @@
 [general]
 version = 4
-name = Normal - Experimental
+name = Normal
 definition = ultimaker_s3
 
 [metadata]
 setting_version = 20
 type = quality
 quality_type = fast
-weight = -1
+weight = -2
 material = generic_pla
 variant = CC 0.6
 is_experimental = True
+
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
 top_bottom_thickness = =layer_height * 4

resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg

@@ -14,6 +14,7 @@ variant = AA 0.25
 [values]
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 12
+
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
@@ -26,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 30 / 70)
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
+

resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg

@@ -11,6 +11,7 @@ weight = 0
 material = generic_pc
 variant = AA 0.25
 is_experimental = True
+
 [values]
 brim_width = 20
 cool_fan_full_at_height = =layer_height_0 + layer_height

resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg

@@ -12,9 +12,9 @@ material = generic_petg
 variant = AA 0.25
 
 [values]
-initial_layer_line_width_factor = 100
-material_print_temperature = =default_material_print_temperature - 5
 retraction_combing_max_distance = 8
 speed_infill = =math.ceil(speed_print * 40 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 top_bottom_thickness = 0.8
+initial_layer_line_width_factor = 100
+material_print_temperature = =default_material_print_temperature - 5

resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg

@@ -11,6 +11,7 @@ weight = 0
 material = generic_pp
 variant = AA 0.25
 is_experimental = True
+
 [values]
 brim_width = 10
 cool_fan_speed_max = 100

resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg

@@ -14,15 +14,15 @@ variant = AA 0.4
 [values]
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
 material_print_temperature = =default_material_print_temperature + 20
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
 prime_tower_enable = False
-raft_airgap = 0.15
 skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = 10
 speed_print = 60
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+speed_infill = =math.ceil(speed_print * 50 / 60)
+raft_airgap = 0.15

resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg

@@ -15,14 +15,14 @@ variant = AA 0.4
 cool_min_speed = 7
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
 material_print_temperature = =default_material_print_temperature + 15
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
 prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 45 / 60)
-speed_layer_0 = 10
 speed_print = 60
+speed_layer_0 = 10
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 45 / 60)
+raft_airgap = 0.15