Merge branch '4.0'

Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
This commit is contained in:
Ghostkeeper 2019-02-15 13:58:47 +01:00
commit d42ba9dda0
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
58 changed files with 80 additions and 161 deletions

View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
setting_version = 7
type = quality
quality_type = normal
quality_type = fast
weight = 0
material = generic_abs
variant = 0.6 mm
@ -17,7 +17,6 @@ cool_min_layer_time = 3
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 20
infill_sparse_density = 20
layer_height = 0.15
speed_infill = =math.ceil(speed_print * 55 / 40)
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40