mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 14:34:01 -06:00
Merge branch 'libArachne_rebased'
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:
commit
9140b71b19
594 changed files with 812 additions and 1608 deletions
|
@ -20,9 +20,8 @@ speed_wall_x = =speed_wall
|
|||
speed_layer_0 = 20
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_thickness = =line_width * 2
|
||||
fill_perimeter_gaps = nowhere
|
||||
infill_sparse_density = 15
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -30,5 +29,5 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_abs
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,6 +29,6 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_abs
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,6 +29,6 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_cpe_plus
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_cpe_plus
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_cpe
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_cpe
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_nylon
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_nylon
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_pc
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_pc
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_petg
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_petg
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,7 +29,7 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
||||
|
|
|
@ -20,9 +20,8 @@ speed_wall_x = =speed_wall
|
|||
speed_layer_0 = 20
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_thickness = =line_width * 2
|
||||
fill_perimeter_gaps = nowhere
|
||||
infill_sparse_density = 15
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -30,5 +29,5 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_pla
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,6 +29,6 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_pla
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,6 +29,6 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
|
|
@ -20,9 +20,8 @@ speed_wall_x = =speed_wall
|
|||
speed_layer_0 = 20
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_thickness = =line_width * 2
|
||||
fill_perimeter_gaps = nowhere
|
||||
infill_sparse_density = 15
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -30,5 +29,5 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_tough_pla
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,6 +29,6 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
|
|
@ -12,7 +12,7 @@ material = generic_tough_pla
|
|||
variant = AA 0.4
|
||||
|
||||
[values]
|
||||
infill_line_width = =line_width
|
||||
|
||||
jerk_print = 30
|
||||
jerk_infill = =jerk_print
|
||||
jerk_topbottom = =jerk_print
|
||||
|
@ -20,7 +20,7 @@ jerk_wall = =jerk_print
|
|||
jerk_wall_0 = =jerk_wall
|
||||
jerk_wall_x = =jerk_wall
|
||||
jerk_layer_0 = 5
|
||||
line_width = =machine_nozzle_size
|
||||
|
||||
speed_print = 30
|
||||
speed_infill = =speed_print
|
||||
speed_layer_0 = 20
|
||||
|
@ -29,6 +29,6 @@ speed_wall = =speed_print
|
|||
speed_wall_0 = =speed_wall
|
||||
speed_wall_x = =speed_wall
|
||||
top_bottom_thickness = =wall_thickness
|
||||
wall_line_width_x = =line_width
|
||||
|
||||
wall_thickness = =line_width * 3
|
||||
xy_offset = =-layer_height * 0.2
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue