3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

4
resources/quality/snapmaker2/snapmaker2_fast.inst.cfg
View file

@ -21,7 +21,7 @@ top_thickness = 0.8
top_layers = 4
bottom_thickness = 0.8
bottom_layers = 4
outer_inset_first = False
inset_direction = inside_out
skin_outline_count = 0
; infill_line_distance = 8
@ -63,4 +63,4 @@ support_pattern = zigzag
support_angle = 50
support_infill_rate = 15
support_line_distance = 2.66
support_initial_layer_line_distance = 2.66
support_initial_layer_line_distance = 2.66

2
resources/quality/snapmaker2/snapmaker2_high.inst.cfg
View file

@ -21,7 +21,7 @@ top_thickness = 0.8
top_layers = 10
bottom_thickness = 0.8
bottom_layers = 10
outer_inset_first = False
inset_direction = inside_out
skin_outline_count = 1
; infill_line_distance = 8

4
resources/quality/snapmaker2/snapmaker2_normal.inst.cfg
View file

@ -21,7 +21,7 @@ top_thickness = 0.8
top_layers = 5
bottom_thickness = 0.8
bottom_layers = 5
outer_inset_first = False
inset_direction = inside_out
skin_outline_count = 0
; infill_line_distance = 8
@ -63,4 +63,4 @@ support_pattern = zigzag
support_angle = 50
support_infill_rate = 15
support_line_distance = 2.66
support_initial_layer_line_distance = 2.66
support_initial_layer_line_distance = 2.66