Merge branch 'master' of github.com:Ultimaker/Cura

resources/definitions/ultimaker_s5.def.json

@@ -63,7 +63,7 @@
         "machine_end_gcode": { "default_value": "" },
         "prime_tower_position_x": { "default_value": 345 },
         "prime_tower_position_y": { "default_value": 222.5 },
-        "prime_blob_enable": { "enabled": true },
+        "prime_blob_enable": { "enabled": false },
 
         "speed_travel":
         {
@@ -127,6 +127,7 @@
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
         "skin_overlap": { "value": "10" },
+        "speed_equalize_flow_enabled": { "value": "True" },
         "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "35" },
@@ -145,6 +146,7 @@
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
+        "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },

resources/qml/SidebarSimple.qml

@@ -784,8 +784,10 @@ Item
 
                     Label {
                         id: gradualInfillLabel
+                        height: parent.height
                         anchors.left: enableGradualInfillCheckBox.right
                         anchors.leftMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2)
+                        verticalAlignment: Text.AlignVCenter;
                         text: catalog.i18nc("@label", "Enable gradual")
                         font: UM.Theme.getFont("default")
                         color: UM.Theme.getColor("text")