Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhostkeeper <rubend@tutanota.com>2021-12-14 13:48:58 +0300
committerGhostkeeper <rubend@tutanota.com>2021-12-14 13:48:58 +0300
commit9140b71b1998d75d51ae556bbb63059de6016c9c (patch)
tree6bc49869a84820770d325d5c0300ed9f1e42bdec /resources/quality/ultimaker_s3
parent64dec9ecc10eb81b68aecc4dcf586e80c03dec01 (diff)
parent2000f8143a1392ea1d198b485ba17e84dba33594 (diff)
Merge branch 'libArachne_rebased'
Conflicts: plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne. resources/definitions -> Bunch of conflicts with profile updates. resources/quality -> Bunch of conflicts with profile updates. resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
Diffstat (limited to 'resources/quality/ultimaker_s3')
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg5
81 files changed, 106 insertions, 279 deletions
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
index df05a87b57..27d9387476 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -14,7 +14,6 @@ variant = AA 0.25
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 12
-infill_line_width = =round(line_width * 0.5 / 0.4, 2)
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
@@ -32,6 +31,6 @@ speed_wall = =math.ceil(speed_print * 30 / 70)
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
+
raft_surface_speed = 45
speed_layer_0 = 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
index d0f482524c..47119e62bf 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -13,15 +13,12 @@ variant = AA 0.25
is_experimental = True
[values]
-acceleration_enabled = True
-acceleration_print = 4000
adhesion_type = brim
brim_width = 20
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_line_width = =line_width
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
jerk_enabled = True
@@ -51,5 +48,4 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_line_width_x = =line_width
wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
index bc9e3f4de2..34fa0d7c84 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -19,5 +19,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
wall_thickness = 0.92
initial_layer_line_width_factor = 100
-infill_before_walls = true
+
material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
index 930539badb..e426ee3efd 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
@@ -13,18 +13,14 @@ variant = AA 0.25
is_experimental = True
[values]
-acceleration_enabled = True
-acceleration_print = 4000
brim_width = 10
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 5
cool_min_speed = 2.5
-infill_line_width = =round(line_width * 0.38 / 0.38, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
jerk_enabled = True
jerk_print = 25
-line_width = =machine_nozzle_size * 0.92
machine_min_cool_heat_time_window = 15
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_final_print_temperature = =material_print_temperature - 10
@@ -42,7 +38,6 @@ retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
retraction_prime_speed = 13
-speed_equalize_flow_enabled = True
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_travel_layer_0 = 50
@@ -55,5 +50,4 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_line_width_x = =line_width
wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg
index 3be4ede280..447d0412aa 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg
@@ -15,10 +15,8 @@ variant = AA 0.25
brim_width = 8
cool_fan_full_at_height = =layer_height_0
cool_min_speed = 7
-infill_line_width = =line_width
infill_overlap = =0 if infill_sparse_density > 80 else 10
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
-line_width = =machine_nozzle_size * 0.92
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
@@ -34,7 +32,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
top_bottom_thickness = 0.72
wall_0_inset = 0.015
wall_0_wipe_dist = 0.25
-wall_line_width = =line_width
-wall_line_width_x= =line_width
wall_thickness = 0.7
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg
index 5bf8f819b2..9644732c0c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg
@@ -26,7 +26,7 @@ speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
wall_thickness = 1
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+
speed_infill = =math.ceil(speed_print * 50 / 60)
raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg
index 586923ce30..81def5bbd8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg
@@ -25,7 +25,7 @@ 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_line_width = =round(line_width * 0.4 / 0.35, 2)
+
speed_infill = =math.ceil(speed_print * 45 / 60)
raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg
index 0c6d89b567..fe4dd8cd17 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg
@@ -24,7 +24,7 @@ speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+
speed_infill = =math.ceil(speed_print * 40 / 50)
raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg
index 015b349dbe..7e46754dde 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg
@@ -23,7 +23,7 @@ speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+
speed_infill = =math.ceil(speed_print * 40 / 55)
raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
index 5180905e90..d0e6e36ea3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -12,11 +12,9 @@ material = generic_cpe_plus
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
cool_fan_speed_max = 80
cool_min_speed = 5
-infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+
infill_overlap = 0
infill_wipe_dist = 0
jerk_enabled = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
index ce011d2d24..51f90c6c8f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -12,11 +12,9 @@ material = generic_cpe_plus
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
cool_fan_speed_max = 80
cool_min_speed = 6
-infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+
infill_overlap = 0
infill_wipe_dist = 0
jerk_enabled = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
index 3dfc922123..e5241c36c6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
@@ -12,11 +12,9 @@ material = generic_cpe_plus
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
cool_fan_speed_max = 50
cool_min_speed = 5
-infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+
infill_overlap = 0
infill_wipe_dist = 0
jerk_enabled = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
index be119e9e55..155001b888 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -12,11 +12,9 @@ material = generic_cpe_plus
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
cool_fan_speed_max = 50
cool_min_speed = 7
-infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+
infill_overlap = 0
infill_wipe_dist = 0
jerk_enabled = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
index 0b8c33f160..5bc7246093 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -15,8 +15,8 @@ variant = AA 0.4
adhesion_type = brim
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-infill_line_width = =round(line_width * 0.5 / 0.4, 2)
-line_width = =machine_nozzle_size
+
+
material_print_temperature = =default_material_print_temperature + 10
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
@@ -33,7 +33,7 @@ speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
+
jerk_travel = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
index 968c92b6f2..614254e9d9 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -15,8 +15,8 @@ variant = AA 0.4
adhesion_type = brim
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-infill_line_width = =round(line_width * 0.5 / 0.4, 2)
-line_width = =machine_nozzle_size
+
+
material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
@@ -33,7 +33,7 @@ speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
+
jerk_travel = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
index db0d869e02..3a11b6dbe3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
@@ -15,8 +15,8 @@ variant = AA 0.4
adhesion_type = brim
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 15
-infill_line_width = =round(line_width * 0.5 / 0.4, 2)
-line_width = =machine_nozzle_size
+
+
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
@@ -32,7 +32,7 @@ speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
+
jerk_travel = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
index 047ce3dfd2..a5abd1bab6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -15,8 +15,8 @@ variant = AA 0.4
adhesion_type = brim
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 12
-infill_line_width = =round(line_width * 0.5 / 0.4, 2)
-line_width = =machine_nozzle_size
+
+
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
@@ -32,7 +32,7 @@ speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
-wall_line_width_x = =wall_line_width
+
jerk_travel = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
index 840676e4fd..69bbcf001d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
@@ -12,15 +12,13 @@ material = generic_pc
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
adhesion_type = brim
brim_width = 20
cool_fan_full_at_height = =layer_height_0 + layer_height
cool_fan_speed_max = 90
cool_min_layer_time_fan_speed_max = 5
cool_min_speed = 6
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+
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'
@@ -59,5 +57,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+
wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
index 2abc0cc16c..63568363d2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
@@ -12,15 +12,12 @@ material = generic_pc
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
adhesion_type = brim
brim_width = 20
cool_fan_full_at_height = =layer_height_0 + layer_height
cool_fan_speed_max = 85
cool_min_layer_time_fan_speed_max = 5
cool_min_speed = 7
-infill_line_width = =round(line_width * 0.4 / 0.35, 2)
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
@@ -59,5 +56,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+
wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
index 82325e883a..3a317c820e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
@@ -12,15 +12,13 @@ material = generic_pc
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
adhesion_type = brim
brim_width = 20
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_line_width = =round(line_width * 0.4 / 0.35, 2)
+
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'
@@ -60,5 +58,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+
wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
index 9bf47a65bb..8b264ad751 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -12,15 +12,13 @@ material = generic_pc
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
adhesion_type = brim
brim_width = 20
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_line_width = =round(line_width * 0.4 / 0.35, 2)
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
@@ -58,5 +56,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+
wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg
index 2513df3784..7ca3b04031 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg
@@ -28,7 +28,7 @@ top_bottom_thickness = 0.8
wall_thickness = 0.8
jerk_travel = 50
-infill_line_width = =round(line_width * 0.42 / 0.35, 2)
+
infill_sparse_density = 15
layer_height_0 = 0.2
acceleration_wall = 2000
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg
index fec0a2e319..38741f40ff 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg
@@ -27,7 +27,7 @@ top_bottom_thickness = 1
wall_thickness = 1
jerk_travel = 50
-infill_line_width = =round(line_width * 0.42 / 0.35, 2)
+
layer_height_0 = 0.2
raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg
index 9fb28d5ef9..871ab6adc8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg
@@ -29,7 +29,7 @@ top_bottom_thickness = 1
wall_thickness = 1
jerk_travel = 50
-infill_line_width = =round(line_width * 0.42 / 0.35, 2)
+
layer_height_0 = 0.2
raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg
index a8bf4c94a7..7c8b71cd68 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg
@@ -25,7 +25,7 @@ top_bottom_thickness = 1
wall_thickness = 1
jerk_travel = 50
-infill_line_width = =round(line_width * 0.42 / 0.35, 2)
+
layer_height_0 = 0.2
raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
index 0e3d4a8079..816eaeda5d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
@@ -12,20 +12,17 @@ material = generic_pp
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
brim_width = 20
cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
-infill_line_width = =round(line_width * 0.38 / 0.38, 2)
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
jerk_enabled = True
jerk_print = 25
-line_width = =machine_nozzle_size * 0.95
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
@@ -46,7 +43,6 @@ retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
retraction_prime_speed = 18
-speed_equalize_flow_enabled = True
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
@@ -58,5 +54,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
index 78cd09b5a8..498bdd6bd5 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
@@ -12,20 +12,16 @@ material = generic_pp
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
brim_width = 20
cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
-infill_line_width = =round(line_width * 0.38 / 0.38, 2)
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
jerk_enabled = True
jerk_print = 25
-line_width = =machine_nozzle_size * 0.95
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
@@ -46,7 +42,6 @@ retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
retraction_prime_speed = 18
-speed_equalize_flow_enabled = True
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
@@ -60,5 +55,5 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1.1
wall_0_inset = 0
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
index 61f34bc18b..28b1470419 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -12,20 +12,18 @@ material = generic_pp
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
brim_width = 20
cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
-infill_line_width = =round(line_width * 0.38 / 0.38, 2)
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
jerk_enabled = True
jerk_print = 25
-line_width = =machine_nozzle_size * 0.95
+
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
@@ -46,7 +44,6 @@ retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
retraction_prime_speed = 18
-speed_equalize_flow_enabled = True
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
@@ -60,5 +57,5 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
wall_0_inset = 0
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
index 228b6896e5..522c35cec2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -15,7 +15,6 @@ 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
-infill_line_width = =round(line_width * 0.45/0.35,2)
jerk_print = 25
jerk_roofing = 1
layer_height_0 = 0.2
@@ -33,5 +32,5 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 36 / 50)
speed_wall_0 = =math.ceil(speed_print * 26 / 50)
top_bottom_thickness = 1.2
-wall_line_width_x = =round(line_width * 0.35/0.35,2)
+
wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg
index 71bbcb765b..b97bdbece7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg
@@ -14,7 +14,6 @@ variant = AA 0.4
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-infill_line_width = =round(line_width * 1.285, 2)
layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
@@ -27,5 +26,5 @@ 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
-wall_line_width_x = =round(line_width * 0.35/0.35,2)
+
wall_thickness = 1.23
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg
index 5e30530b3b..262a1593a3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg
@@ -31,6 +31,3 @@ wall_thickness = 1.23
layer_height_0 = 0.2
-line_width = =round(machine_nozzle_size * 1.025, 3)
-wall_line_width_x = =line_width
-infill_line_width = =line_width
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg
index 3c3833c401..c438fd2a93 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg
@@ -15,7 +15,6 @@ 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
-infill_line_width = =round(line_width * 1.285, 2)
layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
index 194a7d41ca..20545a51f0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -12,21 +12,19 @@ material = generic_tpu
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
brim_width = 8.75
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_line_width = =round(line_width * 0.38 / 0.38, 2)
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1
jerk_enabled = True
jerk_print = 25
-line_width = =machine_nozzle_size * 0.95
+
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.5
machine_nozzle_heat_up_speed = 2.5
@@ -45,7 +43,6 @@ retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
skin_overlap = 5
-speed_equalize_flow_enabled = True
speed_layer_0 = =math.ceil(speed_print * 18 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
@@ -59,5 +56,5 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-wall_line_width_x = =line_width
+
wall_thickness = 0.76
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
index 436b8a32e3..a6ab99ffd6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -12,21 +12,19 @@ material = generic_tpu
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
brim_width = 8.75
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_line_width = =round(line_width * 0.38 / 0.38, 2)
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1
jerk_enabled = True
jerk_print = 25
-line_width = =machine_nozzle_size * 0.95
+
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.5
machine_nozzle_heat_up_speed = 2.5
@@ -45,7 +43,6 @@ retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
skin_overlap = 5
-speed_equalize_flow_enabled = True
speed_layer_0 = =math.ceil(speed_print * 18 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
@@ -59,6 +56,6 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-wall_line_width_x = =line_width
+
wall_thickness = 0.76
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
index d8ade5a573..d8e4c4aae2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -12,21 +12,19 @@ material = generic_tpu
variant = AA 0.4
[values]
-acceleration_enabled = True
-acceleration_print = 4000
brim_width = 8.75
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_line_width = =round(line_width * 0.38 / 0.38, 2)
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
infill_wipe_dist = 0.1
jerk_enabled = True
jerk_print = 25
-line_width = =machine_nozzle_size * 0.95
+
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.5
machine_nozzle_heat_up_speed = 2.5
@@ -44,7 +42,6 @@ retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
skin_overlap = 5
-speed_equalize_flow_enabled = True
speed_layer_0 = =math.ceil(speed_print * 18 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
@@ -58,6 +55,6 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-wall_line_width_x = =line_width
+
wall_thickness = 0.76
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg
index ac51c40fb8..d38564ef8c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg
@@ -12,7 +12,7 @@ material = generic_abs
variant = AA 0.8
[values]
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature + 20
material_standby_temperature = 100
speed_print = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
index edd811fa38..78593302e3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -12,7 +12,7 @@ material = generic_abs
variant = AA 0.8
[values]
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature + 25
material_standby_temperature = 100
speed_print = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg
index 58d82ffb01..a5495fc113 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg
@@ -12,7 +12,7 @@ material = generic_abs
variant = AA 0.8
[values]
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature + 22
material_standby_temperature = 100
speed_print = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg
index df3f853a1d..ab0088e44f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg
@@ -15,8 +15,8 @@ is_experimental = True
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
-infill_before_walls = True
-line_width = =machine_nozzle_size * 0.9375
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 10
@@ -34,6 +34,5 @@ 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)
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.6 / 0.7, 2)
support_z_distance = =layer_height
top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
index 41aa2d39d6..edac440f9a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -15,8 +15,8 @@ is_experimental = True
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
-infill_before_walls = True
-line_width = =machine_nozzle_size * 0.9375
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 5
@@ -34,6 +34,5 @@ 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)
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.6 / 0.7, 2)
support_z_distance = =layer_height
top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg
index b0f1fdd172..fb6e33aff1 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg
@@ -15,8 +15,8 @@ is_experimental = True
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
-infill_before_walls = True
-line_width = =machine_nozzle_size * 0.9375
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 7
@@ -34,6 +34,5 @@ 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)
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.6 / 0.7, 2)
support_z_distance = =layer_height
top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg
index 06cd735575..9e293db418 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg
@@ -13,7 +13,7 @@ variant = AA 0.8
[values]
brim_width = 15
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature + 15
material_standby_temperature = 100
prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
index 6acf4eabf9..0062aa89f8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -13,7 +13,7 @@ variant = AA 0.8
[values]
brim_width = 15
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature + 20
material_standby_temperature = 100
prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg
index 825b569960..86e7b2465e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -13,7 +13,7 @@ variant = AA 0.8
[values]
brim_width = 15
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature + 17
material_standby_temperature = 100
prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
index 7b968b847a..3cb85b22cb 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -15,8 +15,8 @@ variant = AA 0.8
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-infill_before_walls = True
-infill_line_width = =line_width
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_standby_temperature = 100
@@ -28,7 +28,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
raft_margin = 10
raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 896d56aa91..b1962e3f88 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -15,8 +15,8 @@ variant = AA 0.8
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-infill_before_walls = True
-infill_line_width = =line_width
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_standby_temperature = 100
@@ -28,7 +28,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
raft_margin = 10
raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 2f68b0bdf5..5495eafcb3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -15,8 +15,8 @@ variant = AA 0.8
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-infill_before_walls = True
-infill_line_width = =line_width
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_standby_temperature = 100
@@ -28,7 +28,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
raft_margin = 10
raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
index 82ca7f5b35..40d148ef75 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
@@ -15,8 +15,8 @@ is_experimental = True
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
-infill_before_walls = True
-line_width = =machine_nozzle_size * 0.875
+
+
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
@@ -29,4 +29,3 @@ speed_slowdown_layers = 15
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-support_line_width = =round(line_width * 0.6 / 0.7, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
index db1c299c15..4100787241 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -15,8 +15,8 @@ is_experimental = True
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
-infill_before_walls = True
-line_width = =machine_nozzle_size * 0.875
+
+
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
raft_airgap = 0.5
@@ -28,4 +28,3 @@ speed_slowdown_layers = 8
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-support_line_width = =round(line_width * 0.6 / 0.7, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
index 8fc68b4364..5908dd7630 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -15,8 +15,8 @@ is_experimental = True
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
-infill_before_walls = True
-line_width = =machine_nozzle_size * 0.875
+
+
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
@@ -29,4 +29,3 @@ speed_slowdown_layers = 10
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-support_line_width = =round(line_width * 0.6 / 0.7, 2)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
index 0d02bc2a64..c34d5b281b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
@@ -13,7 +13,7 @@ variant = AA 0.8
[values]
brim_width = 7
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
@@ -24,4 +24,3 @@ speed_wall = =math.ceil(speed_print * 30 / 40)
jerk_travel = 50
cool_fan_speed = 20
initial_layer_line_width_factor = 100
-infill_before_walls = true \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
index 82877db1d8..8940e53e23 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -13,7 +13,7 @@ variant = AA 0.8
[values]
brim_width = 7
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
@@ -25,4 +25,3 @@ speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
jerk_travel = 50
cool_fan_speed = 20
initial_layer_line_width_factor = 100
-infill_before_walls = true \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
index 2043a1ba2d..56d72118c6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
@@ -13,7 +13,7 @@ variant = AA 0.8
[values]
brim_width = 7
-line_width = =machine_nozzle_size * 0.875
+
material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100
prime_tower_enable = True
@@ -25,4 +25,4 @@ jerk_travel = 50
cool_fan_speed = 20
layer_height_0 = 0.27
initial_layer_line_width_factor = 100
-infill_before_walls = true
+
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
index 35e9a62710..279e4f4beb 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
@@ -16,8 +16,6 @@ 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
-infill_line_width = =round(line_width * 0.65 / 0.75, 2)
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -25,13 +23,9 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
-
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
index be96127b8c..9c6ec154fe 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -16,8 +16,6 @@ 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
-infill_line_width = =round(line_width * 0.65 / 0.75, 2)
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -26,11 +24,8 @@ material_print_temperature = =default_material_print_temperature + 15
prime_tower_enable = True
raft_margin = 10
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
index 72c0b0a98c..6ef378376d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -16,8 +16,6 @@ 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
-infill_line_width = =round(line_width * 0.65 / 0.75, 2)
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -25,11 +23,8 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
index f7f965146a..0350a1836f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
@@ -16,8 +16,6 @@ brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
top_skin_expand_distance = =line_width * 2
-infill_before_walls = True
-infill_line_width = =round(line_width * 0.7 / 0.8, 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,17 +31,12 @@ retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
-skin_line_width = =round(line_width * 0.78 / 0.8, 2)
-
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.7 / 0.8, 2)
support_offset = =line_width
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-travel_compensate_overlapping_walls_0_enabled = False
wall_0_wipe_dist = =line_width * 2
-wall_line_width_x = =round(line_width * 0.8 / 0.8, 2)
wall_thickness = 1.6
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
index dedc9b8f30..cfe751f38b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -16,8 +16,6 @@ brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
top_skin_expand_distance = =line_width * 2
-infill_before_walls = True
-infill_line_width = =round(line_width * 0.7 / 0.8, 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,17 +31,12 @@ retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
-skin_line_width = =round(line_width * 0.78 / 0.8, 2)
-
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.7 / 0.8, 2)
support_offset = =line_width
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-travel_compensate_overlapping_walls_0_enabled = False
wall_0_wipe_dist = =line_width * 2
-wall_line_width_x = =round(line_width * 0.8 / 0.8, 2)
wall_thickness = 1.6
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
index d52ee60a7d..58a7cea554 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -16,8 +16,6 @@ brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
top_skin_expand_distance = =line_width * 2
-infill_before_walls = True
-infill_line_width = =round(line_width * 0.7 / 0.8, 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,17 +30,12 @@ retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
-skin_line_width = =round(line_width * 0.78 / 0.8, 2)
-
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.7 / 0.8, 2)
support_offset = =line_width
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-travel_compensate_overlapping_walls_0_enabled = False
wall_0_wipe_dist = =line_width * 2
-wall_line_width_x = =round(line_width * 0.8 / 0.8, 2)
wall_thickness = 1.6
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg
index 07c7c3544b..91e9ac5632 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg
@@ -16,10 +16,8 @@ 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
-infill_line_width = =round(line_width * 0.75 / 0.75, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
layer_height_0 = 0.4
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -32,9 +30,6 @@ speed_topbottom = =round(speed_print * 35 / 45)
speed_wall = =round(speed_print * 40 / 45)
speed_wall_0 = =round(speed_print * 35 / 45)
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 6
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
index 9a8662e261..db12dff2f0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -16,10 +16,8 @@ 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
-infill_line_width = =round(line_width * 0.75 / 0.75, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
layer_height_0 = 0.4
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -34,8 +32,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 30)
speed_wall = =math.ceil(speed_print * 25/ 30)
speed_wall_0 = =math.ceil(speed_print * 20 / 30)
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg
index 276d6e64da..a97439f98c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg
@@ -16,10 +16,8 @@ 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
-infill_line_width = =round(line_width * 0.75 / 0.75, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
layer_height_0 = 0.4
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -35,9 +33,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 35)
speed_wall = =math.ceil(speed_print * 25/ 35)
speed_wall_0 = =math.ceil(speed_print * 20 / 35)
support_angle = 70
-support_line_width = =line_width * 0.75
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
index 3497d5340c..47cb0623eb 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -15,8 +15,6 @@ variant = AA 0.8
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
top_skin_expand_distance = =line_width * 2
-infill_before_walls = True
-infill_line_width = =round(line_width * 0.7 / 0.8, 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
@@ -36,24 +34,18 @@ retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
-skin_line_width = =round(line_width * 0.78 / 0.8, 2)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 25 / 30)
-
speed_wall = =math.ceil(speed_print * 30 / 30)
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
support_angle = 50
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.7 / 0.8, 2)
support_offset = =line_width
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
-travel_compensate_overlapping_walls_0_enabled = False
wall_0_wipe_dist = =line_width * 2
-wall_line_width_x = =round(line_width * 0.6 / 0.8, 2)
wall_thickness = 1.3
-
jerk_travel = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
index e552f7ebaa..1155e46024 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -15,8 +15,6 @@ variant = AA 0.8
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
top_skin_expand_distance = =line_width * 2
-infill_before_walls = True
-infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
machine_nozzle_cool_down_speed = 0.5
@@ -37,24 +35,18 @@ retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
-skin_line_width = =round(line_width * 0.78 / 0.8, 2)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
-
speed_wall = =math.ceil(speed_print * 30 / 30)
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
support_angle = 50
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.7 / 0.8, 2)
support_offset = =line_width
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
-travel_compensate_overlapping_walls_0_enabled = False
wall_0_wipe_dist = =line_width * 2
-wall_line_width_x = =round(line_width * 0.6 / 0.8, 2)
wall_thickness = 1.3
-
jerk_travel = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 5ec5a2bd67..ab5562474d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -15,8 +15,6 @@ variant = AA 0.8
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
top_skin_expand_distance = =line_width * 2
-infill_before_walls = True
-infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
machine_nozzle_cool_down_speed = 0.5
@@ -36,24 +34,18 @@ retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
-skin_line_width = =round(line_width * 0.78 / 0.8, 2)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 23 / 30)
-
speed_wall = =math.ceil(speed_print * 30 / 30)
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
support_angle = 50
support_bottom_distance = =support_z_distance
-support_line_width = =round(line_width * 0.7 / 0.8, 2)
support_offset = =line_width
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
-travel_compensate_overlapping_walls_0_enabled = False
wall_0_wipe_dist = =line_width * 2
-wall_line_width_x = =round(line_width * 0.6 / 0.8, 2)
wall_thickness = 1.3
-
jerk_travel = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg
index 6625cba6c3..b71262e643 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg
index 597c93ddc5..053afc04a5 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg
index a345e968f3..259e269406 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg
index 0b9e9d022a..3233442e50 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg
index 8f46012ed5..b4151ee80b 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg
index 6f94a48449..becf437583 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg
index 528aa4da07..a167732e56 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg
index d286cbcb1f..70a6eee76e 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg
@@ -17,9 +17,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
+
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +28,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg
index a7c599f881..c354eea9e3 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg
@@ -17,9 +17,7 @@ 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
-infill_line_width = =round(line_width * 0.65 / 0.75, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-line_width = =machine_nozzle_size
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)
@@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_x = =speed_wall
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
-support_line_width = =line_width * 0.75
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg
index 5fd28c9a74..a0778a7f88 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg
@@ -17,9 +17,7 @@ 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
-infill_line_width = =round(line_width * 0.65 / 0.75, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-line_width = =machine_nozzle_size
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)
@@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_x = =speed_wall
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
-support_line_width = =line_width * 0.75
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg
index 5c5d6453ab..fb60ce93f7 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg
@@ -17,9 +17,7 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg
index 4948613fc7..9520fde07e 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg
@@ -17,9 +17,7 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg
index 02ffb07f13..12098a1949 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg
@@ -17,9 +17,7 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg
index c0276dca69..83577034b3 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg
@@ -17,9 +17,7 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
-infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
-line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -28,4 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
-wall_line_width_x = =line_width
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg
index f819110fc2..c78b060dee 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg
@@ -17,9 +17,7 @@ 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
-infill_line_width = =round(line_width * 0.65 / 0.75, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_x = =speed_wall
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
-support_line_width = =line_width * 0.75
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg
index 5198080708..031db016b6 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg
@@ -17,9 +17,7 @@ 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
-infill_line_width = =round(line_width * 0.65 / 0.75, 2)
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-line_width = =machine_nozzle_size * 0.9375
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)
@@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_x = =speed_wall
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
-support_line_width = =line_width * 0.75
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_line_width = =round(line_width * 0.75 / 0.75, 2)
-wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x