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
[values]
infill_sparse_density = 10
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]
layer_height = 0.06
speed_topbottom = =math.ceil(speed_print * 15 / 60)
speed_infill = =math.ceil(speed_print * 80 / 60)