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 = Normal
definition = ultimaker3
[metadata]
setting_version = 4
type = quality
quality_type = fast
material = generic_pp_ultimaker3_AA_0.4
weight = -1
setting_version = 4
material = generic_pp
variant = AA 0.4
[values]
acceleration_enabled = True
@ -61,4 +62,4 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1.1
wall_0_inset = 0
wall_line_width_x = =line_width
wall_thickness = =line_width * 3
wall_thickness = =line_width * 3