Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1

cura/PrintInformation.py

@@ -264,13 +264,14 @@ class PrintInformation(QObject):
     def jobName(self):
         return self._job_name
 
-    def _updateJobName(self, empty_name = False):
+    def _updateJobName(self, is_project_name_empty = False):
         # if the project name is set, we use the project name as the job name, so the job name should not get updated
         # if a model file is loaded after that.
         if self._project_name != "":
-            if empty_name:
+            if is_project_name_empty:
                 self._project_name = ""
-            return
+            else:
+                return
 
         if self._base_name == "":
             self._job_name = ""
@@ -312,7 +313,7 @@ class PrintInformation(QObject):
             if name.endswith(".curaproject"):
                 name = name[:name.rfind(".curaproject")]
             self._base_name = name
-            self._updateJobName(empty_name = is_empty)
+            self._updateJobName(is_project_name_empty = is_empty)
 
     ##  Created an acronymn-like abbreviated machine name from the currently active machine name
     #   Called each time the global stack is switched

resources/qml/SidebarHeader.qml

@@ -346,7 +346,7 @@ Column
             Label {
                 id: materialInfoLabel
                 wrapMode: Text.WordWrap
-                text: catalog.i18nc("@label", "<a href='%1'>Check material compatibility</a>")
+                text: catalog.i18nc("@label", "<a href='%1'>Check compatibility</a>")
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text")
                 linkColor: UM.Theme.getColor("text_link")

resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg

@@ -1,36 +0,0 @@
-[general]
-version = 2
-name = Fine
-definition = ultimaker3
-
-[metadata]
-type = quality
-quality_type = normal
-material = generic_bam_ultimaker3_AA_0.4
-weight = 0
-setting_version = 4
-
-[values]
-default_material_print_temperature = 225
-cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
-cool_fan_speed_max = =cool_fan_speed
-cool_min_speed = 7
-machine_nozzle_cool_down_speed = 0.75
-machine_nozzle_heat_up_speed = 1.6
-material_standby_temperature = 100
-# prime_tower_enable: see CURA-4248
-prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
-skin_overlap = 10
-speed_layer_0 = 20
-top_bottom_thickness = 1
-wall_thickness = 1
-support_interface_enable = True
-support_interface_density = =min(extruderValues('material_surface_energy'))
-support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric'
-support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-support_angle = 45
-support_join_distance = 5
-support_offset = 2
-support_pattern = triangles
-support_infill_rate = 10