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,12 +1,11 @@
[general]
name = AA 0.4
version = 2
version = 3
definition = ultimaker3
[metadata]
author = ultimaker
type = variant
setting_version = 4
type = variant
hardware_type = nozzle
[values]
@ -41,4 +40,3 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
wall_thickness = 1.3