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
2025-08-09 14:55:03 -06:00 · 2019-02-15 13:58:47 +01:00 · 2019-02-15 13:58:47 +01:00 · d42ba9dda0
commit d42ba9dda0
parent aefacde7d5 f3cab17e20
58 changed files with 80 additions and 161 deletions
--- a/resources/qml/Account/AvatarImage.qml
+++ b/resources/qml/Account/AvatarImage.qml
@ -22,7 +22,6 @@ Item
    {
        id: profileImage
        anchors.fill: parent
-        source: UM.Theme.getImage("avatar_default")
        fillMode: Image.PreserveAspectCrop
        visible: false
        mipmap: true
--- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml
+++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
@ -90,6 +90,10 @@ Item
                        cornerRadius: 0
                        hoverColor: UM.Theme.getColor("primary")
                        Layout.fillWidth: true
+                        // The total width of the popup should be defined by the largest button. By stating that each
+                        // button should be minimally the size of it's content (aka; implicitWidth) we can ensure that.
+                        Layout.minimumWidth: implicitWidth
+                        Layout.preferredHeight: widget.height
                        onClicked:
                        {
                            UM.OutputDeviceManager.setActiveDevice(model.id)
--- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
@ -15,7 +15,6 @@ variant = 0.25 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 top_bottom_thickness = 0.72
--- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
@ -15,7 +15,6 @@ variant = 0.4 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 18
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 60)
 speed_print = 60
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
--- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
@ -15,7 +15,6 @@ variant = 0.4 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 50)
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 20 / 50)
--- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
@ -15,7 +15,6 @@ variant = 0.4 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.1
 speed_layer_0 = =round(speed_print * 30 / 50)
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 20 / 50)
--- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_pla
 variant = 0.6 mm
@ -15,7 +15,6 @@ variant = 0.6 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 55)
 speed_print = 55
 speed_topbottom = =math.ceil(speed_print * 20 / 55)
--- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_pla
 variant = 0.8 mm
@ -15,7 +15,6 @@ variant = 0.8 mm
 cool_min_layer_time = 5
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.2
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 speed_wall_0 = =math.ceil(speed_print * 25 / 40)
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 top_bottom_thickness = 0.72
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 18
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 55)
 speed_print = 55
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.1
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
@ -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
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_abs
 variant = 0.8 mm
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 25
 cool_min_speed = 15
 infill_sparse_density = 20
-layer_height = 0.2
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 top_bottom_thickness = 1.2
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 2
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 15
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 top_bottom_thickness = 0.72
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 18
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_travel = 150
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 2
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 15
 infill_sparse_density = 22
-layer_height = 0.06
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 15
 cool_min_speed = 10
 infill_sparse_density = 20
-layer_height = 0.1
 speed_layer_0 = =round(speed_print * 30 / 45)
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_cpe
 variant = 0.6 mm
@ -17,7 +17,6 @@ cool_min_layer_time = 5
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 8
 infill_sparse_density = 20
-layer_height = 0.15
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 top_bottom_thickness = 1.2
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_cpe
 variant = 0.8 mm
@ -17,7 +17,6 @@ cool_min_layer_time = 3
 cool_min_layer_time_fan_speed_max = 25
 cool_min_speed = 8
 infill_sparse_density = 20
-layer_height = 0.2
 speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 top_bottom_thickness = 1.2
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 line_width = 0.38
 raft_airgap = 0.37
 raft_base_line_spacing = 1.6
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_cpe_plus
 variant = 0.4 mm
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 line_width = 0.38
 raft_airgap = 0.37
 raft_base_line_spacing = 1.6
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = slightlycoarse
 weight = -2
 material = generic_cpe_plus
 variant = 0.6 mm
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 line_width = 0.57
 raft_airgap = 0.37
 raft_base_line_spacing = 2.4
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_cpe_plus
 variant = 0.6 mm
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.22
 line_width = 0.57
 raft_airgap = 0.37
 raft_base_line_spacing = 2.4
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = slightlycoarse
 weight = -2
 material = generic_cpe_plus
 variant = 0.8 mm
@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 raft_airgap = 0.37
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_cpe_plus
 variant = 0.8 mm
@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 raft_airgap = 0.37
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
--- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = extra coarse
+quality_type = extracoarse
 weight = -3
 global_quality = True

--- a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg
@ -0,0 +1,14 @@
+[general]
+version = 4
+name = Coarse Quality
+definition = ultimaker2_plus
+
+[metadata]
+setting_version = 6
+type = quality
+quality_type = slightlycoarse
+weight = -4
+global_quality = True
+
+[values]
+layer_height = 0.3
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
@ -20,7 +20,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.1
-layer_height = 0.06
 raft_airgap = 0.15
 raft_base_line_width = 0.5
 raft_interface_line_spacing = 0.7
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
@ -20,7 +20,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.1
-layer_height = 0.1
 raft_airgap = 0.15
 raft_base_line_width = 0.5
 raft_interface_line_spacing = 0.7
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_nylon
 variant = 0.4 mm
@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 raft_airgap = 0.57
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_nylon
 variant = 0.4 mm
@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 raft_airgap = 0.57
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = slightlycoarse
 weight = -1
 material = generic_nylon
 variant = 0.6 mm
@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 raft_airgap = 0.44
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_nylon
 variant = 0.6 mm
@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 raft_airgap = 0.44
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = slightlycoarse
 weight = -2
 material = generic_nylon
 variant = 0.8 mm
@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.25
-layer_height = 0.3
 raft_airgap = 0.44
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_nylon
 variant = 0.8 mm
@ -19,7 +19,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.25
-layer_height = 0.2
 raft_airgap = 0.44
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
@ -21,7 +21,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.2
-layer_height = 0.06
 raft_airgap = 0.25
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
@ -21,7 +21,6 @@ cool_min_speed = 15
 infill_overlap = 5
 infill_sparse_density = 25
 layer_0_z_overlap = 0.2
-layer_height = 0.1
 raft_airgap = 0.25
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = draft
 weight = -1
 material = generic_pc
 variant = 0.4 mm
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.3
-layer_height = 0.2
 raft_airgap = 0.35
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 30
 layer_0_z_overlap = 0.3
-layer_height = 0.1
 raft_airgap = 0.35
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
+quality_type = slightlycoarse
 weight = -1
 material = generic_pc
 variant = 0.6 mm
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.3
 raft_airgap = 0.52
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = fast
 weight = 0
 material = generic_pc
 variant = 0.6 mm
@ -20,7 +20,6 @@ cool_min_speed = 8
 infill_overlap = 5
 infill_sparse_density = 35
 layer_0_z_overlap = 0.22
-layer_height = 0.15
 raft_airgap = 0.52
 raft_base_line_spacing = 2.4
 raft_base_line_width = 1.2
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
+quality_type = extracoarse
 weight = -2
 material = generic_pc
 variant = 0.8 mm
@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.5
 raft_airgap = 0.47
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
@ -6,7 +6,7 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = normal
+quality_type = draft
 weight = 0
 material = generic_pc
 variant = 0.8 mm
@ -20,7 +20,6 @@ cool_min_layer_time = 3
 infill_overlap = 5
 infill_sparse_density = 40
 layer_0_z_overlap = 0.22
-layer_height = 0.2
 raft_airgap = 0.47
 raft_base_line_width = 1.6
 raft_interface_line_spacing = 1.8
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.15
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.2
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.15
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@ -6,8 +6,8 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
 material = generic_pp
 variant = 0.8 mm

@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.2
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@ -6,8 +6,8 @@ definition = ultimaker2_plus
 [metadata]
 setting_version = 7
 type = quality
-quality_type = draft
-weight = -2
+quality_type = slightlycoarse
+weight = -3
 material = generic_pp
 variant = 0.8 mm

@ -39,7 +39,6 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.3
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@ -20,7 +20,6 @@ cool_min_layer_time = 7
 cool_min_speed = 15
 infill_sparse_density = 10
 layer_0_z_overlap = 0.1
-layer_height = 0.06
 raft_airgap = 0.2
 raft_base_line_spacing = 1
 raft_interface_line_spacing = 1
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@ -19,7 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60
 cool_min_speed = 15
 infill_sparse_density = 10
 layer_0_z_overlap = 0.12
-layer_height = 0.12
 line_width = 0.57
 raft_airgap = 0.24
 raft_base_line_spacing = 1.2
--- a/resources/themes/cura-light/images/avatar_default.svg
+++ b/resources/themes/cura-light/images/avatar_default.svg
@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500"
-   height="500"
-   viewBox="0 0 132.29167 132.29167"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="avatar_default.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="264.32988"
-     inkscape:cy="275.53798"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="2872"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-164.70834)">
-    <g
-       id="g819"
-       transform="matrix(2.4332992,0,0,2.4332992,27.213046,191.79972)"
-       style="fill:#098cbc;fill-opacity:1">
-      <path
-         id="path815"
-         d="m 16,15.7 c 3.6,0 6.4,-3.5 6.4,-7.8 C 22.4,3.6 21.5,0 16,0 10.5,0 9.6,3.5 9.6,7.8 c 0,4.4 2.8,7.9 6.4,7.9 z"
-         inkscape:connector-curvature="0"
-         style="fill:#098cbc;fill-opacity:1" />
-      <path
-         id="path817"
-         d="m 28.2,27.3 c -0.1,-7.5 -1.1,-9.7 -8.6,-11 -0.9,0.9 -2.2,1.4 -3.5,1.3 -1.3,0.1 -2.6,-0.4 -3.5,-1.3 C 5,17.6 4,19.7 3.8,27 c 0,0.2 0,0.4 0,0.6 v 0.8 c 0,0 1.8,3.7 12.2,3.7 10.4,0 12.2,-3.6 12.2,-3.6 v -0.6 c 0,-0.3 -0.1,-0.4 0,-0.6 z"
-         inkscape:connector-curvature="0"
-         style="fill:#098cbc;fill-opacity:1" />
-    </g>
-  </g>
-</svg>