Merge branch 'M&P-Setting-Optimization' of https://github.com/Ultimaker/Cura into M&P-Setting-Optimization

Fixed conflicts
This commit is contained in:
THeijmans 2018-03-13 11:58:33 +01:00
commit 392605014a
704 changed files with 10823 additions and 9649 deletions

View file

@ -1,14 +1,15 @@
[general]
version = 2
version = 3
name = Sprint - Experimental
definition = ultimaker3
[metadata]
setting_version = 4
type = quality
quality_type = superdraft
material = generic_cpe_plus_ultimaker3_AA_0.8
weight = -4
setting_version = 4
material = generic_cpe_plus
variant = AA 0.8
[values]
brim_width = 14
@ -35,4 +36,4 @@ speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_bottom_distance = =support_z_distance
support_line_width = =round(line_width * 0.6 / 0.7, 2)
support_z_distance = =layer_height
top_bottom_thickness = 1.2
top_bottom_thickness = 1.2