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

cura/Settings/MaterialSettingsVisibilityHandler.py

@@ -11,6 +11,7 @@ class MaterialSettingsVisibilityHandler(UM.Settings.Models.SettingVisibilityHand
             "default_material_print_temperature",
             "material_bed_temperature",
             "material_standby_temperature",
+            "material_flow_temp_graph",
             "cool_fan_speed",
             "retraction_amount",
             "retraction_speed",

plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -54,30 +54,32 @@ class FirmwareUpdateCheckerJob(Job):
                 # Nothing to parse, just get the string
                 # TODO: In the future may be done by parsing a JSON file with diferent version for each printer model
                 current_version = reader(current_version_file).readline().rstrip()
-                Logger.log("i", "Reading firmware version of %s: %s", machine_name, current_version)
 
-                # If it is the first time the version is checked, the checked_version is None
+                # If it is the first time the version is checked, the checked_version is ''
                 checked_version = Preferences.getInstance().getValue("info/latest_checked_firmware")
 
                 # If the checked_version is '', it's because is the first time we check firmware and in this case
                 # we will not show the notification, but we will store it for the next time
+                Preferences.getInstance().setValue("info/latest_checked_firmware", current_version)
+                Logger.log("i", "Reading firmware version of %s: checked = %s - latest = %s", machine_name, checked_version, current_version)
+
+                # The first time we want to store the current version, the notification will not be shown,
+                # because the new version of Cura will be release before the firmware and we don't want to
+                # notify the user when no new firmware version is available.
                 if (checked_version != "") and (checked_version != current_version):
-                    message = Message(i18n_catalog.i18nc("@info", "<b>New %s firmware available</b><br/><br/>To ensure that your "
+                    Logger.log("i", "SHOWING FIRMWARE UPDATE MESSAGE")
-                                                                  "%s is equiped with the latest features it is recommended "
+                    message = Message(i18n_catalog.i18nc("@info", "To ensure that your %s is equipped with the latest "
-                                                                  "to update the firmware regularly. This can be done on the "
+                                                                  "features it is recommended to update the firmware "
-                                                                  "%s (when connected to the network) or via USB."
+                                                                  "regularly. This can be done on the %s (when connected "
-                                                         % (machine_name, machine_name, machine_name)))
+                                                                  "to the network) or via USB."
+                                                         % (machine_name, machine_name)),
+                                      title = i18n_catalog.i18nc("@info:title", "New %s firmware available" % machine_name))
                     message.addAction("download", i18n_catalog.i18nc("@action:button", "Download"), "[no_icon]", "[no_description]")
 
                     # If we do this in a cool way, the download url should be available in the JSON file
                     self._download_url = "https://ultimaker.com/en/resources/20500-upgrade-firmware"
                     message.actionTriggered.connect(self.actionTriggered)
-                    Application.getInstance().showMessage(message)
+                    message.show()
-
-                # The first time we want to store the current version, the notification will not be shown,
-                # because the new version of Cura will be release before the firmware and we don't want to
-                # notify the user when no new firmware version is available.
-                Preferences.getInstance().setValue("info/latest_checked_firmware", current_version)
 
         except Exception as e:
             Logger.log("w", "Failed to check for new version: %s", e)

resources/definitions/fdmprinter.def.json

@@ -5756,6 +5756,16 @@
                     "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true
                 },
+                "ironing_only_highest_layer":
+                {
+                    "label": "Iron Only Highest Layer",
+                    "description": "Only perform ironing on the very last layer of the mesh. This saves time if the lower layers don't need a smooth surface finish.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "ironing_enabled",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
+                    "settable_per_mesh": true
+                },
                 "ironing_pattern":
                 {
                     "label": "Ironing Pattern",

resources/definitions/prusa_i3_mk2.def.json

@@ -41,7 +41,7 @@
         "machine_max_jerk_e": { "default_value": 2.5 },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_start_gcode": {
-            "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nM104 S{material_print_temperature} ; set extruder temp\nM140 S{material_bed_temperature} ; set bed temp\nM190 S{material_bed_temperature} ; wait for bed temp\nM109 S{material_print_temperature} ; wait for extruder temp\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position"
+            "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature} ; set extruder temp\nM140 S{material_bed_temperature} ; set bed temp\nM190 S{material_bed_temperature} ; wait for bed temp\nM109 S{material_print_temperature} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position"
         },
         "machine_end_gcode": {
             "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors"

resources/definitions/ultimaker2.def.json

@@ -89,9 +89,6 @@
         "machine_max_feedrate_z": {
             "default_value": 40
         },
-        "machine_max_feedrate_e": {
-            "default_value": 45
-        },
         "machine_acceleration": {
             "default_value": 3000
         },