Merge branch '2.6'

resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg

@@ -21,7 +21,6 @@ material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
 ooze_shield_angle = 40
-prime_tower_enable = False
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)

resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg

@@ -21,7 +21,6 @@ material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
 ooze_shield_angle = 40
-prime_tower_enable = False
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)

resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg

@@ -20,7 +20,6 @@ material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
 ooze_shield_angle = 40
-prime_tower_enable = False
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)

resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg

@@ -20,7 +20,6 @@ material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 material_standby_temperature = 100
 ooze_shield_angle = 40
-prime_tower_enable = False
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)

resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg

@@ -39,6 +39,7 @@ ooze_shield_angle = 40
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
+raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
@@ -62,4 +63,3 @@ 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
-xy_offset = -0.15

resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg

@@ -38,6 +38,7 @@ ooze_shield_angle = 40
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
+raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
@@ -61,4 +62,3 @@ 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
-xy_offset = -0.15

resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg

@@ -39,6 +39,7 @@ ooze_shield_angle = 40
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
+raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
@@ -62,4 +63,3 @@ 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
-xy_offset = -0.15

resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg

@@ -36,6 +36,7 @@ ooze_shield_angle = 40
 prime_tower_enable = True
 prime_tower_wipe_enabled = True
 raft_airgap = 0.25
+raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
@@ -59,4 +60,3 @@ 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
-xy_offset = -0.15

resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg

@@ -20,6 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
 ooze_shield_angle = 40
+prime_tower_enable = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)

resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg

@@ -21,6 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
 ooze_shield_angle = 40
+prime_tower_enable = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)

resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg

@@ -21,6 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 material_standby_temperature = 100
 ooze_shield_angle = 40
+prime_tower_enable = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)

resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg

@@ -15,10 +15,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
-gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.535 / 0.75, 2)
 infill_pattern = cubic
-infill_sparse_density = 80
 line_width = =machine_nozzle_size * 0.9375
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
@@ -26,6 +24,7 @@ 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
 material_standby_temperature = 100
+prime_tower_enable = True
 support_angle = 70
 support_line_width = =line_width * 0.75
 support_pattern = ='triangles'

resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg

@@ -15,10 +15,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
-gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.535 / 0.75, 2)
 infill_pattern = cubic
-infill_sparse_density = 80
 layer_height = 0.4
 line_width = =machine_nozzle_size * 0.9375
 machine_nozzle_cool_down_speed = 0.75
@@ -27,6 +25,7 @@ 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
 material_standby_temperature = 100
+prime_tower_enable = True
 raft_margin = 10
 support_angle = 70
 support_line_width = =line_width * 0.75

resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg

@@ -15,10 +15,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
-gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.535 / 0.75, 2)
 infill_pattern = cubic
-infill_sparse_density = 80
 layer_height = 0.3
 line_width = =machine_nozzle_size * 0.9375
 machine_nozzle_cool_down_speed = 0.75
@@ -27,6 +25,7 @@ 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
 material_standby_temperature = 100
+prime_tower_enable = True
 support_angle = 70
 support_line_width = =line_width * 0.75
 support_pattern = ='triangles'