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

@ -11,11 +11,4 @@ weight = -1
global_quality = True global_quality = True
[values] [values]
infill_sparse_density = 10
layer_height = 0.15 layer_height = 0.15
cool_min_layer_time = 3
speed_wall_0 = =math.ceil(speed_print * 40 / 60)
speed_wall_x = =math.ceil(speed_print * 80 / 60)
speed_infill = =math.ceil(speed_print * 100 / 60)
wall_thickness = 1
speed_topbottom = =math.ceil(speed_print * 30 / 60)

View file

@ -12,5 +12,3 @@ global_quality = True
[values] [values]
layer_height = 0.06 layer_height = 0.06
speed_topbottom = =math.ceil(speed_print * 15 / 60)
speed_infill = =math.ceil(speed_print * 80 / 60)

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -7,7 +7,7 @@ definition = ultimaker_original
setting_version = 5 setting_version = 5
type = quality type = quality
quality_type = high quality_type = high
weight = 0 weight = 1
global_quality = True global_quality = True
[values] [values]