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

This commit is contained in:
Jaime van Kessel 2022-09-08 13:16:14 +02:00
commit e2cef9b5b3
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4
54 changed files with 0 additions and 54 deletions

View file

@ -23,7 +23,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 15
prime_tower_enable = True
raft_margin = 10
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 35 / 45)

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 10
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 20
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 15
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 0
prime_tower_enable = False
retract_at_layer_change = False
speed_print = 45
support_angle = 70
top_bottom_thickness = =layer_height * 6

View file

@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 5
prime_tower_enable = False
raft_margin = 10
retract_at_layer_change = False
speed_infill = =math.ceil(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)

View file

@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 5
material_print_temperature_layer_0 = =material_print_temperature
prime_tower_enable = False
retract_at_layer_change = False
speed_infill = =math.ceil(speed_print * 30 / 35)
speed_topbottom = =math.ceil(speed_print * 20 / 35)
speed_wall = =math.ceil(speed_print * 25/ 35)

View file

@ -28,7 +28,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 19
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -29,7 +29,6 @@ material_print_temperature_layer_0 = =material_print_temperature +15
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -28,7 +28,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -18,4 +18,3 @@ speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
retract_at_layer_change = False

View file

@ -19,4 +19,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 37 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
speed_infill = =math.ceil(speed_print * 37 / 50)
retract_at_layer_change = False

View file

@ -18,4 +18,3 @@ speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
retract_at_layer_change = False

View file

@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
support_angle = 70
top_bottom_thickness = =layer_height * 4
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -25,7 +25,6 @@ prime_tower_enable = True
raft_margin = 10
support_angle = 70
top_bottom_thickness = =layer_height * 4
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 35 / 45)

View file

@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
support_angle = 70
top_bottom_thickness = =layer_height * 4
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 10
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 20
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -23,7 +23,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 15
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 0
prime_tower_enable = False
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =round(speed_print * 35 / 45)
speed_wall = =round(speed_print * 40 / 45)

View file

@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 5
prime_tower_enable = False
raft_margin = 10
retract_at_layer_change = False
speed_infill = =math.ceil(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)

View file

@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 5
material_print_temperature_layer_0 = =material_print_temperature
prime_tower_enable = False
retract_at_layer_change = False
speed_infill = =math.ceil(speed_print * 30 / 35)
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 20 / 35)

View file

@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 19
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -27,7 +27,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -18,4 +18,3 @@ speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
retract_at_layer_change = False

View file

@ -19,4 +19,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 37 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
speed_infill = =math.ceil(speed_print * 37 / 50)
retract_at_layer_change = False

View file

@ -18,4 +18,3 @@ speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
retract_at_layer_change = False

View file

@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
support_angle = 70
top_bottom_thickness = =layer_height * 4
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -25,7 +25,6 @@ prime_tower_enable = True
raft_margin = 10
support_angle = 70
top_bottom_thickness = =layer_height * 4
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 35 / 45)

View file

@ -24,7 +24,6 @@ material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
support_angle = 70
top_bottom_thickness = =layer_height * 4
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 10
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -24,7 +24,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 20
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -23,7 +23,6 @@ multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_min_volume = 15
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 0
prime_tower_enable = False
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =round(speed_print * 35 / 45)
speed_wall = =round(speed_print * 40 / 45)

View file

@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 5
prime_tower_enable = False
raft_margin = 10
retract_at_layer_change = False
speed_infill = =math.ceil(speed_print * 30 / 30)
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)

View file

@ -25,7 +25,6 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
material_print_temperature = =default_material_print_temperature + 5
material_print_temperature_layer_0 = =material_print_temperature
prime_tower_enable = False
retract_at_layer_change = False
speed_infill = =math.ceil(speed_print * 30 / 35)
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 20 / 35)

View file

@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 19
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -27,7 +27,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 15
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -26,7 +26,6 @@ material_print_temperature_layer_0 = =material_print_temperature + 17
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
retract_at_layer_change = False
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -30,7 +30,6 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
retract_at_layer_change = =not magic_spiralize
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True

View file

@ -30,7 +30,6 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
retract_at_layer_change = True
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True

View file

@ -30,7 +30,6 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
retract_at_layer_change = =not magic_spiralize
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True

View file

@ -31,7 +31,6 @@ material_initial_print_temperature = =material_print_temperature - 5
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
retract_at_layer_change = =not magic_spiralize
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True