Diego Prado Gesto eca855c8c2 Merge branch '3.4' ...

Fix some conflicts. Change the weights of the global UMO profiles.

2018-06-28 14:43:39 +02:00

..

um2_draft.inst.cfg

Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d

2018-06-13 16:55:44 +02:00

um2_fast.inst.cfg

Merge branch '3.4'

2018-06-28 14:43:39 +02:00

um2_high.inst.cfg

Merge branch '3.4'

2018-06-28 14:43:39 +02:00

um2_normal.inst.cfg

Update setting_version to 5 and add 34 -> 40 upgrade

2018-06-12 10:17:35 +02:00