Merge branch '3.4'

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

resources/quality/ultimaker2/um2_fast.inst.cfg

@@ -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)

resources/quality/ultimaker2/um2_high.inst.cfg

@@ -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)

resources/quality/ultimaker2_plus/um2p_global_Superdraft_Quality.inst.cfg → resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg

@@ -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
 

resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg

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

resources/quality/ultimaker2_plus/um2p_global_Verydraft_Quality.inst.cfg → resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg

@@ -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

resources/quality/ultimaker_original/umo_global_Superdraft_Quality.inst.cfg → resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg

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

resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg

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

resources/quality/ultimaker_original/umo_global_Verydraft_Quality.inst.cfg → resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg

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

resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg

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