mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 22:13:58 -06:00
Merge branch '2.6'
This commit is contained in:
commit
a13ec0072f
18 changed files with 15 additions and 21 deletions
|
@ -45,6 +45,5 @@ speed_wall = =math.ceil(speed_print * 50 / 50)
|
|||
speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
|
||||
support_bottom_distance = =support_z_distance
|
||||
support_z_distance = =layer_height
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
wall_thickness = 1
|
||||
|
|
|
@ -45,5 +45,4 @@ speed_wall = =math.ceil(speed_print * 45 / 45)
|
|||
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
|
||||
support_bottom_distance = =support_z_distance
|
||||
support_z_distance = =layer_height
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
|
|
|
@ -47,5 +47,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40)
|
|||
speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
|
||||
support_bottom_distance = =support_z_distance
|
||||
support_z_distance = =layer_height
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
|
|
|
@ -46,5 +46,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40)
|
|||
speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
|
||||
support_bottom_distance = =support_z_distance
|
||||
support_z_distance = =layer_height
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
|
|
|
@ -59,7 +59,6 @@ support_interface_pattern = lines
|
|||
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 = =round(line_width * 0.4 / 0.35, 2)
|
||||
wall_thickness = 1.2
|
||||
|
|
|
@ -58,7 +58,6 @@ support_interface_pattern = lines
|
|||
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 = =round(line_width * 0.4 / 0.35, 2)
|
||||
wall_thickness = 1.2
|
||||
|
|
|
@ -59,7 +59,6 @@ support_interface_pattern = lines
|
|||
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 = =round(line_width * 0.4 / 0.35, 2)
|
||||
wall_thickness = 1.2
|
||||
|
|
|
@ -56,7 +56,6 @@ support_interface_pattern = lines
|
|||
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 = =round(line_width * 0.4 / 0.35, 2)
|
||||
wall_thickness = 1.2
|
||||
|
|
|
@ -44,7 +44,7 @@ retraction_count_max = 12
|
|||
retraction_extra_prime_amount = 0.8
|
||||
retraction_extrusion_window = 1
|
||||
retraction_hop = 2
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_enabled = False
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 0.8
|
||||
retraction_prime_speed = 15
|
||||
|
@ -56,11 +56,12 @@ speed_travel = 300
|
|||
speed_wall = =math.ceil(speed_print * 25 / 25)
|
||||
speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
|
||||
support_angle = 50
|
||||
skin_overlap = 5
|
||||
switch_extruder_prime_speed = 15
|
||||
switch_extruder_retraction_amount = 20
|
||||
switch_extruder_retraction_speeds = 35
|
||||
top_bottom_thickness = 0.7
|
||||
travel_avoid_distance = 3
|
||||
travel_avoid_distance = 0.5
|
||||
wall_0_inset = 0
|
||||
wall_line_width_x = =line_width
|
||||
wall_thickness = 0.76
|
||||
|
|
|
@ -45,10 +45,11 @@ retraction_count_max = 12
|
|||
retraction_extra_prime_amount = 0.8
|
||||
retraction_extrusion_window = 1
|
||||
retraction_hop = 2
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_enabled = False
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 0.8
|
||||
retraction_prime_speed = 15
|
||||
skin_overlap = 5
|
||||
speed_equalize_flow_enabled = True
|
||||
speed_layer_0 = 18
|
||||
speed_print = 25
|
||||
|
@ -61,7 +62,7 @@ switch_extruder_prime_speed = 15
|
|||
switch_extruder_retraction_amount = 20
|
||||
switch_extruder_retraction_speeds = 35
|
||||
top_bottom_thickness = 0.7
|
||||
travel_avoid_distance = 3
|
||||
travel_avoid_distance = 0.5
|
||||
wall_0_inset = 0
|
||||
wall_line_width_x = =line_width
|
||||
wall_thickness = 0.76
|
||||
|
|
|
@ -42,10 +42,11 @@ retraction_count_max = 12
|
|||
retraction_extra_prime_amount = 0.8
|
||||
retraction_extrusion_window = 1
|
||||
retraction_hop = 2
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_enabled = False
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 0.8
|
||||
retraction_prime_speed = 15
|
||||
skin_overlap = 5
|
||||
speed_equalize_flow_enabled = True
|
||||
speed_layer_0 = 18
|
||||
speed_print = 25
|
||||
|
@ -58,7 +59,7 @@ switch_extruder_prime_speed = 15
|
|||
switch_extruder_retraction_amount = 20
|
||||
switch_extruder_retraction_speeds = 35
|
||||
top_bottom_thickness = 0.7
|
||||
travel_avoid_distance = 3
|
||||
travel_avoid_distance = 0.5
|
||||
wall_0_inset = 0
|
||||
wall_line_width_x = =line_width
|
||||
wall_thickness = 0.76
|
||||
|
|
|
@ -38,11 +38,11 @@ retract_at_layer_change = False
|
|||
retraction_count_max = 12
|
||||
retraction_extra_prime_amount = 0.5
|
||||
retraction_hop = 0.5
|
||||
retraction_hop_enabled = False
|
||||
retraction_hop_only_when_collides = False
|
||||
retraction_min_travel = 0.8
|
||||
retraction_prime_speed = 15
|
||||
skin_line_width = =round(line_width * 0.78 / 0.8, 2)
|
||||
skin_overlap = 15
|
||||
speed_print = 30
|
||||
speed_topbottom = =math.ceil(speed_print * 25 / 30)
|
||||
speed_travel = 300
|
||||
|
@ -56,6 +56,7 @@ switch_extruder_prime_speed = 15
|
|||
switch_extruder_retraction_amount = 20
|
||||
switch_extruder_retraction_speeds = 45
|
||||
top_bottom_thickness = 1.2
|
||||
travel_avoid_distance = 0.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)
|
||||
|
|
|
@ -39,11 +39,11 @@ retract_at_layer_change = False
|
|||
retraction_count_max = 12
|
||||
retraction_extra_prime_amount = 0.5
|
||||
retraction_hop = 0.5
|
||||
retraction_hop_enabled = False
|
||||
retraction_hop_only_when_collides = False
|
||||
retraction_min_travel = 0.8
|
||||
retraction_prime_speed = 15
|
||||
skin_line_width = =round(line_width * 0.78 / 0.8, 2)
|
||||
skin_overlap = 15
|
||||
speed_print = 30
|
||||
speed_topbottom = =math.ceil(speed_print * 20 / 30)
|
||||
speed_travel = 300
|
||||
|
@ -57,6 +57,7 @@ switch_extruder_prime_speed = 15
|
|||
switch_extruder_retraction_amount = 20
|
||||
switch_extruder_retraction_speeds = 45
|
||||
top_bottom_thickness = 1.2
|
||||
travel_avoid_distance = 0.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)
|
||||
|
|
|
@ -38,11 +38,11 @@ retract_at_layer_change = False
|
|||
retraction_count_max = 12
|
||||
retraction_extra_prime_amount = 0.5
|
||||
retraction_hop = 0.5
|
||||
retraction_hop_enabled = False
|
||||
retraction_hop_only_when_collides = False
|
||||
retraction_min_travel = 0.8
|
||||
retraction_prime_speed = 15
|
||||
skin_line_width = =round(line_width * 0.78 / 0.8, 2)
|
||||
skin_overlap = 15
|
||||
speed_print = 30
|
||||
speed_topbottom = =math.ceil(speed_print * 23 / 30)
|
||||
speed_travel = 300
|
||||
|
@ -56,6 +56,7 @@ switch_extruder_prime_speed = 15
|
|||
switch_extruder_retraction_amount = 20
|
||||
switch_extruder_retraction_speeds = 45
|
||||
top_bottom_thickness = 1.2
|
||||
travel_avoid_distance = 0.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)
|
||||
|
|
|
@ -60,7 +60,6 @@ support_z_distance = =layer_height * 2
|
|||
switch_extruder_prime_speed = 20
|
||||
switch_extruder_retraction_amount = 16.5
|
||||
top_bottom_thickness = 1.4
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
wall_line_width_x = =wall_line_width
|
||||
wall_thickness = 2
|
||||
|
|
|
@ -81,7 +81,6 @@ support_z_distance = 0
|
|||
switch_extruder_prime_speed = 15
|
||||
switch_extruder_retraction_amount = 12
|
||||
top_bottom_thickness = 1
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
wall_line_width_x = =wall_line_width
|
||||
wall_thickness = 1
|
||||
|
|
|
@ -60,7 +60,6 @@ support_z_distance = =layer_height * 2
|
|||
switch_extruder_prime_speed = 20
|
||||
switch_extruder_retraction_amount = 16.5
|
||||
top_bottom_thickness = 1.4
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
wall_line_width_x = =wall_line_width
|
||||
wall_thickness = 2
|
||||
|
|
|
@ -81,7 +81,6 @@ support_z_distance = 0
|
|||
switch_extruder_prime_speed = 15
|
||||
switch_extruder_retraction_amount = 12
|
||||
top_bottom_thickness = 1
|
||||
travel_avoid_distance = 3
|
||||
wall_0_inset = 0
|
||||
wall_line_width_x = =wall_line_width
|
||||
wall_thickness = 1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue