Merge branch 'master' of github.com:Ultimaker/Cura

resources/definitions/ultimaker3.def.json

@@ -126,7 +126,7 @@
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
-        "retraction_hop_enabled": { "value": "True" },
+        "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
@@ -150,7 +150,7 @@
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
-        "travel_avoid_distance": { "value": "3" },
+        "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
         "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },

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

@@ -34,7 +34,6 @@ raft_airgap = 0.25
 raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 15

resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg

@@ -38,7 +38,6 @@ retraction_count_max = 45
 retraction_extra_prime_amount = 0.2
 retraction_extrusion_window = 6.5
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 13

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

@@ -44,7 +44,6 @@ raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 15

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

@@ -43,7 +43,6 @@ raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 15

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

@@ -44,7 +44,6 @@ raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 15

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

@@ -41,7 +41,6 @@ raft_interface_thickness = =max(layer_height * 1.5, 0.225)
 retraction_count_max = 80
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 15

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

@@ -45,7 +45,6 @@ retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 18
@@ -61,7 +60,6 @@ support_angle = 50
 switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
-travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

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

@@ -44,7 +44,6 @@ retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 18
@@ -61,7 +60,6 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 switch_extruder_retraction_speeds = 35
 top_bottom_thickness = 1.1
-travel_avoid_distance = 3
 wall_0_inset = 0
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

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

@@ -43,7 +43,6 @@ retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 0.8
 retraction_prime_speed = 18
@@ -60,7 +59,6 @@ switch_extruder_prime_speed = 15
 switch_extruder_retraction_amount = 20
 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

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

@@ -43,7 +43,6 @@ retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
 retraction_hop = 1.5
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15

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

@@ -44,7 +44,6 @@ retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
 retraction_hop = 1.5
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15

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

@@ -41,7 +41,6 @@ retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
 retraction_hop = 1.5
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15

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

@@ -36,4 +36,3 @@ 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
-travel_avoid_distance = 1.5

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

@@ -37,4 +37,3 @@ 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
-travel_avoid_distance = 1.5

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

@@ -37,4 +37,3 @@ 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
-travel_avoid_distance = 1.5

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

@@ -29,4 +29,3 @@ 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)
-travel_avoid_distance = 3

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

@@ -29,4 +29,3 @@ 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)
-travel_avoid_distance = 3

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

@@ -30,4 +30,3 @@ 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)
-travel_avoid_distance = 3

resources/variants/ultimaker3_aa0.8.inst.cfg

@@ -45,7 +45,6 @@ retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 skin_overlap = 5
 speed_equalize_flow_enabled = True

resources/variants/ultimaker3_aa04.inst.cfg

@@ -12,6 +12,7 @@ hardware_type = nozzle
 brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
+machine_nozzle_tip_outer_diameter = 1.0
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
 raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2

resources/variants/ultimaker3_bb04.inst.cfg

@@ -20,6 +20,7 @@ jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
 jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
+machine_nozzle_tip_outer_diameter = 1.0
 prime_tower_purge_volume = 1
 raft_base_speed = 20
 raft_interface_speed = 20

resources/variants/ultimaker3_extended_aa0.8.inst.cfg

@@ -45,7 +45,6 @@ retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 skin_overlap = 5
 speed_equalize_flow_enabled = True

resources/variants/ultimaker3_extended_aa04.inst.cfg

@@ -12,6 +12,7 @@ hardware_type = nozzle
 brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
+machine_nozzle_tip_outer_diameter = 1.0
 raft_acceleration = =acceleration_print
 raft_airgap = 0.3
 raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2

resources/variants/ultimaker3_extended_bb0.8.inst.cfg

@@ -56,7 +56,6 @@ retraction_amount = 4.5
 retraction_count_max = 15
 retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
-retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 5
 retraction_prime_speed = 15

resources/variants/ultimaker3_extended_bb04.inst.cfg

@@ -20,6 +20,7 @@ jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
 jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
+machine_nozzle_tip_outer_diameter = 1.0
 prime_tower_purge_volume = 1
 raft_base_speed = 20
 raft_interface_speed = 20