3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'libArachne_rebased'

Browse source 
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.
This commit is contained in:
Ghostkeeper 2021-12-14 11:48:58 +01:00
commit 9140b71b19
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
594 changed files with 812 additions and 1608 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
View file

@ -19,7 +19,6 @@ cool_min_speed = 8
infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
line_width = 0.38
raft_airgap = 0.37
raft_base_line_spacing = 1.6
raft_base_line_width = 0.8

1
resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
View file

@ -19,7 +19,6 @@ cool_min_speed = 8
infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
line_width = 0.38
raft_airgap = 0.37
raft_base_line_spacing = 1.6
raft_base_line_width = 0.8

1
resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
View file

@ -19,7 +19,6 @@ cool_min_speed = 8
infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
line_width = 0.57
raft_airgap = 0.37
raft_base_line_spacing = 2.4
raft_base_line_width = 1.2

1
resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
View file

@ -19,7 +19,6 @@ cool_min_speed = 8
infill_overlap = =0 if infill_sparse_density > 80 else 5
infill_sparse_density = 20
layer_0_z_overlap = 0.22
line_width = 0.57
raft_airgap = 0.37
raft_base_line_spacing = 2.4
raft_base_line_width = 1.2

3
resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
View file

@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
infill_line_width = =round(line_width * 0.4 / 0.38, 2)
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0
@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
line_width = =machine_nozzle_size * 0.95
multiple_mesh_overlap = 0
retraction_count_max = 12
retraction_extrusion_window = 1
@ -66,7 +64,6 @@ support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height * 2
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.38 / 0.38, 2)
wall_thickness = 0.76
speed_wall_x = =math.ceil(speed_print * 25 / 25)
speed_infill = =math.ceil(speed_print * 25 / 25)

3
resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
View file

@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
infill_line_width = =round(line_width * 0.4 / 0.38, 2)
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0
@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
line_width = =machine_nozzle_size * 0.95
multiple_mesh_overlap = 0
retraction_count_max = 12
retraction_extrusion_window = 1
@ -66,5 +64,4 @@ support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height * 2
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.38 / 0.38, 2)
wall_thickness = 0.76

4
resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
View file

@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
infill_line_width = =round(line_width * 0.6 / 0.57, 2)
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0
@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
line_width = =machine_nozzle_size * 0.95
multiple_mesh_overlap = 0
retraction_count_max = 12
retraction_extrusion_window = 1
@ -48,7 +46,6 @@ retraction_hop_enabled = True
retraction_hop_only_when_collides = True
retraction_prime_speed = 15
skin_overlap = 10
skirt_brim_line_width = 0.6
speed_layer_0 = =speed_print
speed_prime_tower = =speed_topbottom
speed_print = 25
@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.1
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.57 / 0.57, 2)
wall_thickness = 1.14

4
resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
View file

@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
infill_line_width = =round(line_width * 0.6 / 0.57, 2)
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0
@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
line_width = =machine_nozzle_size * 0.95
multiple_mesh_overlap = 0
retraction_count_max = 12
retraction_extrusion_window = 1
@ -48,7 +46,6 @@ retraction_hop_enabled = True
retraction_hop_only_when_collides = True
retraction_prime_speed = 15
skin_overlap = 10
skirt_brim_line_width = 0.6
speed_layer_0 = =speed_print
speed_prime_tower = =speed_topbottom
speed_print = 25
@ -67,7 +64,6 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.1
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.57 / 0.57, 2)
wall_thickness = 1.14
speed_wall_x = =math.ceil(speed_print * 25 / 25)
speed_infill = =math.ceil(speed_print * 25 / 25)

4
resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
View file

@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
infill_line_width = =round(line_width * 0.8 / 0.76, 2)
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0
@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
line_width = =machine_nozzle_size * 0.95
multiple_mesh_overlap = 0
retraction_count_max = 12
retraction_extrusion_window = 1
@ -48,7 +46,6 @@ retraction_hop_enabled = True
retraction_hop_only_when_collides = True
retraction_prime_speed = 15
skin_overlap = 10
skirt_brim_line_width = 0.8
speed_layer_0 = =speed_print
speed_prime_tower = =speed_topbottom
speed_print = 25
@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.5
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.76 / 0.76, 2)
wall_thickness = 1.52

4
resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
View file

@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 20
infill_line_width = =round(line_width * 0.8 / 0.76, 2)
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0
@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
line_width = =machine_nozzle_size * 0.95
multiple_mesh_overlap = 0
retraction_count_max = 12
retraction_extrusion_window = 1
@ -48,7 +46,6 @@ retraction_hop_enabled = True
retraction_hop_only_when_collides = True
retraction_prime_speed = 15
skin_overlap = 10
skirt_brim_line_width = 0.8
speed_layer_0 = =speed_print
speed_prime_tower = =speed_topbottom
speed_print = 25
@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.5
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.76 / 0.76, 2)
wall_thickness = 1.52

1
resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
View file

@ -19,7 +19,6 @@ cool_fan_speed_min = =cool_fan_speed
cool_min_speed = 15
infill_sparse_density = 10
layer_0_z_overlap = 0.12
line_width = 0.57
raft_airgap = 0.24
raft_base_line_spacing = 1.2
raft_base_line_width = 0.6