Merge branch '3.4'

Fix some conflicts. Change the weights of the global UMO profiles.
This commit is contained in:
Diego Prado Gesto 2018-06-28 14:43:39 +02:00
commit eca855c8c2
9 changed files with 15 additions and 24 deletions

View file

@ -1,12 +1,12 @@
[general]
version = 4
name = Sprint
name = Coarse Quality
definition = ultimaker2_plus
[metadata]
setting_version = 5
type = quality
quality_type = superdraft
quality_type = coarse
weight = -4
global_quality = True

View file

@ -1,6 +1,6 @@
[general]
version = 4
name = Fast
name = Draft Quality
definition = ultimaker2_plus
[metadata]

View file

@ -1,14 +1,14 @@
[general]
version = 4
name = Extra Fast
name = Extra Coarse Quality
definition = ultimaker2_plus
[metadata]
setting_version = 5
type = quality
quality_type = verydraft
quality_type = extra coarse
weight = -3
global_quality = True
[values]
layer_height = 0.3
layer_height = 0.6