Merge branch 'master' into cura4.0_header

2025-08-08 14:34:01 -06:00 · 2018-10-17 16:10:45 +02:00 · 2018-10-17 16:10:45 +02:00 · b670cd82c4
commit b670cd82c4
parent 304a9e11f3 f013450195
106 changed files with 1289 additions and 947 deletions
--- a/resources/bundled_packages/cura.json
+++ b/resources/bundled_packages/cura.json
@ -118,6 +118,23 @@
            }
        }
    },
+    "FirmwareUpdater": {
+        "package_info": {
+            "package_id": "FirmwareUpdater",
+            "package_type": "plugin",
+            "display_name": "Firmware Updater",
+            "description": "Provides a machine actions for updating firmware.",
+            "package_version": "1.0.0",
+            "sdk_version": 5,
+            "website": "https://ultimaker.com",
+            "author": {
+                "author_id": "Ultimaker",
+                "display_name": "Ultimaker B.V.",
+                "email": "plugins@ultimaker.com",
+                "website": "https://ultimaker.com"
+            }
+        }
+    },
    "GCodeGzReader": {
        "package_info": {
            "package_id": "GCodeGzReader",
--- a/resources/definitions/bq_hephestos.def.json
+++ b/resources/definitions/bq_hephestos.def.json
@ -12,7 +12,8 @@
        "machine_extruder_trains":
        {
            "0": "bq_hephestos_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinHephestos2.hex"
    },

    "overrides": {
--- a/resources/definitions/bq_witbox.def.json
+++ b/resources/definitions/bq_witbox.def.json
@ -12,7 +12,8 @@
        "machine_extruder_trains":
        {
            "0": "bq_witbox_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinWitbox.hex"
    },

    "overrides": {
--- a/resources/definitions/creality_ender3.def.json
+++ b/resources/definitions/creality_ender3.def.json
@ -9,7 +9,8 @@
        "file_formats": "text/x-gcode",
        "platform": "creality_ender3_platform.stl",
        "preferred_quality_type": "draft",
-        "machine_extruder_trains": {
+        "machine_extruder_trains":
+        {
            "0": "creality_ender3_extruder_0"
        }
    },
@ -40,6 +41,9 @@
                [30, 34]
            ]
        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
        "acceleration_enabled": {
            "default_value": true
        },
@ -55,6 +59,9 @@
        "jerk_travel": {
            "default_value": 20
        },
+        "layer_height": {
+            "default_value": 0.10
+        },
        "layer_height_0": {
            "default_value": 0.2
        },
@ -86,4 +93,4 @@
            "default_value": "; Ender 3 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z10 ; Move Z Axis up 10 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM104 S0 ; Turn off Extruder temperature\nM140 S0 ; Turn off Heat Bed\nM106 S0 ; Turn off Cooling Fan\nM107 ; Turn off Fan\nM84 ; Disable stepper motors"
        }
    }
-}
+}
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -1217,11 +1217,11 @@
                "connect_skin_polygons":
                {
                    "label": "Connect Top/Bottom Polygons",
-                    "description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality.",
+                    "description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality.",
                    "type": "bool",
                    "default_value": false,
                    "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern == 'concentric'",
-                    "limit_to_extruder": "infill_extruder_nr",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
                    "settable_per_mesh": true
                },
                "skin_angles":
@ -3918,6 +3918,48 @@
                    "settable_per_mesh": false,
                    "settable_per_extruder": true
                },
+                "support_brim_enable":
+                {
+                    "label": "Enable Support Brim",
+                    "description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "support_enable or support_tree_enable",
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "support_brim_width":
+                {
+                    "label": "Support Brim Width",
+                    "description": "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 8.0,
+                    "minimum_value": "0.0",
+                    "maximum_value_warning": "50.0",
+                    "enabled": "support_enable",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true,
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "children":
+                    {
+                        "support_brim_line_count":
+                        {
+                            "label": "Support Brim Line Count",
+                            "description": "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material.",
+                            "type": "int",
+                            "default_value": 20,
+                            "minimum_value": "0",
+                            "maximum_value_warning": "50 / skirt_brim_line_width",
+                            "value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
+                            "enabled": "support_enable",
+                            "settable_per_mesh": false,
+                            "settable_per_extruder": true,
+                            "limit_to_extruder": "support_infill_extruder_nr"
+                        }
+                    }
+                },
                "support_z_distance":
                {
                    "label": "Support Z Distance",
@ -4568,6 +4610,17 @@
                        }
                    }
                },
+                "brim_replaces_support":
+                {
+                    "label": "Brim Replaces Support",
+                    "description": "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions.",
+                    "type": "bool",
+                    "default_value": true,
+                    "enabled": "resolveOrValue('adhesion_type') == 'brim' and support_enable",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true,
+                    "limit_to_extruder": "adhesion_extruder_nr"
+                },
                "brim_outside_only":
                {
                    "label": "Brim Only on Outside",
--- a/resources/definitions/makeit_pro_l.def.json
+++ b/resources/definitions/makeit_pro_l.def.json
@ -8,7 +8,6 @@
        "manufacturer": "NA",
        "file_formats": "text/x-gcode",
        "has_materials": false,
-        "supported_actions": [ "MachineSettingsAction", "UpgradeFirmware" ],
        "machine_extruder_trains":
        {
            "0": "makeit_l_dual_1st",
--- a/resources/definitions/makeit_pro_m.def.json
+++ b/resources/definitions/makeit_pro_m.def.json
@ -8,7 +8,6 @@
        "manufacturer": "NA",
        "file_formats": "text/x-gcode",
        "has_materials": false,
-        "supported_actions": [ "MachineSettingsAction", "UpgradeFirmware" ],
        "machine_extruder_trains":
        {
            "0": "makeit_dual_1st",
--- a/resources/definitions/makerbotreplicator.def.json
+++ b/resources/definitions/makerbotreplicator.def.json
@ -6,6 +6,7 @@
        "visible": true,
        "author": "Ultimaker",
        "manufacturer": "MakerBot",
+        "machine_x3g_variant": "r1",
        "file_formats": "application/x3g",
        "platform_offset": [ 0, 0, 0],
        "machine_extruder_trains":
--- a/resources/definitions/tam.def.json
+++ b/resources/definitions/tam.def.json
@ -10,7 +10,6 @@
        "platform": "tam_series1.stl",
        "platform_offset": [-580.0, -6.23, 253.5],
        "has_materials": false,
-        "supported_actions": ["UpgradeFirmware"],
        "machine_extruder_trains":
        {
            "0": "tam_extruder_0"
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@ -17,11 +17,12 @@
        "preferred_variant_name": "0.4 mm",
        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
        "first_start_actions": ["UM2UpgradeSelection"],
-        "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"],
+        "supported_actions":["UM2UpgradeSelection"],
        "machine_extruder_trains":
        {
            "0": "ultimaker2_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinUltimaker2.hex"
    },
    "overrides": {
        "machine_name": { "default_value": "Ultimaker 2" },
--- a/resources/definitions/ultimaker2_extended.def.json
+++ b/resources/definitions/ultimaker2_extended.def.json
@ -14,7 +14,8 @@
        "machine_extruder_trains":
        {
            "0": "ultimaker2_extended_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinUltimaker2extended.hex"
    },

    "overrides": {
--- a/resources/definitions/ultimaker2_extended_plus.def.json
+++ b/resources/definitions/ultimaker2_extended_plus.def.json
@ -10,11 +10,11 @@
        "file_formats": "text/x-gcode",
        "platform": "ultimaker2_platform.obj",
        "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
-        "supported_actions": ["UpgradeFirmware"],
        "machine_extruder_trains":
        {
            "0": "ultimaker2_extended_plus_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinUltimaker2extended-plus.hex"
    },

    "overrides": {
--- a/resources/definitions/ultimaker2_go.def.json
+++ b/resources/definitions/ultimaker2_go.def.json
@ -13,11 +13,11 @@
        "platform_texture": "Ultimaker2Gobackplate.png",
        "platform_offset": [0, 0, 0],
        "first_start_actions": [],
-        "supported_actions": ["UpgradeFirmware"],
        "machine_extruder_trains":
        {
            "0": "ultimaker2_go_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinUltimaker2go.hex"
    },

    "overrides": {
--- a/resources/definitions/ultimaker2_plus.def.json
+++ b/resources/definitions/ultimaker2_plus.def.json
@ -15,11 +15,11 @@
        "has_machine_materials": true,
        "has_machine_quality": true,
        "first_start_actions": [],
-        "supported_actions": ["UpgradeFirmware"],
        "machine_extruder_trains":
        {
            "0": "ultimaker2_plus_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinUltimaker2plus.hex"
    },

    "overrides": {
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@ -24,7 +24,16 @@
        },
        "first_start_actions": [ "DiscoverUM3Action" ],
        "supported_actions": [ "DiscoverUM3Action" ],
-        "supports_usb_connection": false
+        "supports_usb_connection": false,
+        "firmware_update_info": {
+            "id": 9066,
+            "check_urls":
+            [
+                "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources",
+                "http://software.ultimaker.com/releases/firmware/9066/stable/version.txt"
+            ],
+            "update_url": "https://ultimaker.com/firmware"
+        }
    },


--- a/resources/definitions/ultimaker3_extended.def.json
+++ b/resources/definitions/ultimaker3_extended.def.json
@ -23,7 +23,16 @@
            "1": "ultimaker3_extended_extruder_right"
        },
        "first_start_actions": [ "DiscoverUM3Action" ],
-        "supported_actions": [ "DiscoverUM3Action" ]
+        "supported_actions": [ "DiscoverUM3Action" ],
+        "firmware_update_info": {
+            "id": 9511,
+            "check_urls":
+            [
+                "http://software.ultimaker.com/jedi/releases/latest.version?utm_source=cura&utm_medium=software&utm_campaign=resources",
+                "http://software.ultimaker.com/releases/firmware/9511/stable/version.txt"
+            ],
+            "update_url": "https://ultimaker.com/firmware"
+        }
    },

    "overrides": {
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@ -14,11 +14,13 @@
        "has_machine_quality": true,
        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
        "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
-        "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"],
+        "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
        "machine_extruder_trains":
        {
            "0": "ultimaker_original_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinUltimaker-{baudrate}.hex",
+        "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex"
    },

    "overrides": {
--- a/resources/definitions/ultimaker_original_dual.def.json
+++ b/resources/definitions/ultimaker_original_dual.def.json
@ -19,8 +19,10 @@
            "0": "ultimaker_original_dual_1st",
            "1": "ultimaker_original_dual_2nd"
        },
+        "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex",
+        "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex",
        "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
-        "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"]
+        "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"]
    },

    "overrides": {
--- a/resources/definitions/ultimaker_original_plus.def.json
+++ b/resources/definitions/ultimaker_original_plus.def.json
@ -12,11 +12,12 @@
        "platform_texture": "UltimakerPlusbackplate.png",
        "quality_definition": "ultimaker_original",
        "first_start_actions": ["UMOCheckup", "BedLevel"],
-        "supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"],
+        "supported_actions": ["UMOCheckup", "BedLevel"],
        "machine_extruder_trains":
        {
            "0": "ultimaker_original_plus_extruder_0"
-        }
+        },
+        "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex"
    },

    "overrides": {
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@ -30,7 +30,12 @@
        "first_start_actions": [ "DiscoverUM3Action" ],
        "supported_actions": [ "DiscoverUM3Action" ],
        "supports_usb_connection": false,
-        "weight": -1
+        "weight": -1,
+        "firmware_update_info": {
+            "id": 9051,
+            "check_urls": ["http://software.ultimaker.com/releases/firmware/9051/stable/version.txt"],
+            "update_url": "https://ultimaker.com/firmware"
+        }
    },

    "overrides": {
@ -63,7 +68,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": false },
+        "prime_blob_enable": { "enabled": true, "default_value": false },

        "speed_travel":
        {
--- a/resources/definitions/wanhao_d6.def.json
+++ b/resources/definitions/wanhao_d6.def.json
@ -18,9 +18,6 @@
      0,
      -28,
      0
-    ],
-    "supported_actions": [
-      "UpgradeFirmware"
    ]
  },
  "overrides": {
--- a/resources/extruders/alya3dp_extruder_0.def.json
+++ b/resources/extruders/alya3dp_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/creality_cr10s4_extruder_0.def.json
+++ b/resources/extruders/creality_cr10s4_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/creality_cr10s5_extruder_0.def.json
+++ b/resources/extruders/creality_cr10s5_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/creality_ender3_extruder_0.def.json
+++ b/resources/extruders/creality_ender3_extruder_0.def.json
@ -9,14 +9,8 @@
    },

    "overrides": {
-        "extruder_nr": {
-            "default_value": 0
-        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
-        "material_diameter": {
-            "default_value": 1.75
-        }
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
    }
-}
+}
--- a/resources/extruders/deltabot_extruder_0.def.json
+++ b/resources/extruders/deltabot_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.5 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/grr_neo_extruder_0.def.json
+++ b/resources/extruders/grr_neo_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.5 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/kupido_extruder_0.def.json
+++ b/resources/extruders/kupido_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/makeR_pegasus_extruder_0.def.json
+++ b/resources/extruders/makeR_pegasus_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/maker_starter_extruder_0.def.json
+++ b/resources/extruders/maker_starter_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json
+++ b/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json
+++ b/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/extruders/printrbot_play_heated_extruder_0.def.json
+++ b/resources/extruders/printrbot_play_heated_extruder_0.def.json
@ -11,6 +11,6 @@
    "overrides": {
        "extruder_nr": { "default_value": 0 },
        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 2.85 }
+        "material_diameter": { "default_value": 1.75 }
    }
 }
--- a/resources/qml/Dialogs/AboutDialog.qml
+++ b/resources/qml/Dialogs/AboutDialog.qml
@ -19,6 +19,18 @@ UM.Dialog
    width: minimumWidth
    height: minimumHeight

+    Rectangle
+    {
+        width: parent.width + 2 * margin // margin from Dialog.qml
+        height: version.y + version.height + margin
+
+        anchors.top: parent.top
+        anchors.topMargin: - margin
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        color: UM.Theme.getColor("viewport_background")
+    }
+
    Image
    {
        id: logo
@ -42,6 +54,7 @@ UM.Dialog

        text: catalog.i18nc("@label","version: %1").arg(UM.Application.version)
        font: UM.Theme.getFont("large")
+        color: UM.Theme.getColor("text")
        anchors.right : logo.right
        anchors.top: logo.bottom
        anchors.topMargin: (UM.Theme.getSize("default_margin").height / 2) | 0
@ -75,6 +88,7 @@ UM.Dialog

    ScrollView
    {
+        id: credits
        anchors.top: creditsNotes.bottom
        anchors.topMargin: UM.Theme.getSize("default_margin").height

@ -128,7 +142,11 @@ UM.Dialog
                projectsModel.append({ name:"SciPy", description: catalog.i18nc("@label", "Support library for scientific computing"), license: "BSD-new", url: "https://www.scipy.org/" });
                projectsModel.append({ name:"NumPy", description: catalog.i18nc("@label", "Support library for faster math"), license: "BSD", url: "http://www.numpy.org/" });
                projectsModel.append({ name:"NumPy-STL", description: catalog.i18nc("@label", "Support library for handling STL files"), license: "BSD", url: "https://github.com/WoLpH/numpy-stl" });
+                projectsModel.append({ name:"Shapely", description: catalog.i18nc("@label", "Support library for handling planar objects"), license: "BSD", url: "https://github.com/Toblerity/Shapely" });
+                projectsModel.append({ name:"Trimesh", description: catalog.i18nc("@label", "Support library for handling triangular meshes"), license: "MIT", url: "https://trimsh.org" });
+                projectsModel.append({ name:"NetworkX", description: catalog.i18nc("@label", "Support library for analysis of complex networks"), license: "3-clause BSD", url: "https://networkx.github.io/" });
                projectsModel.append({ name:"libSavitar", description: catalog.i18nc("@label", "Support library for handling 3MF files"), license: "LGPLv3", url: "https://github.com/ultimaker/libsavitar" });
+                projectsModel.append({ name:"libCharon", description: catalog.i18nc("@label", "Support library for file metadata and streaming"), license: "LGPLv3", url: "https://github.com/ultimaker/libcharon" });
                projectsModel.append({ name:"PySerial", description: catalog.i18nc("@label", "Serial communication library"), license: "Python", url: "http://pyserial.sourceforge.net/" });
                projectsModel.append({ name:"python-zeroconf", description: catalog.i18nc("@label", "ZeroConf discovery library"), license: "LGPL", url: "https://github.com/jstasiak/python-zeroconf" });
                projectsModel.append({ name:"Clipper", description: catalog.i18nc("@label", "Polygon clipping library"), license: "Boost", url: "http://www.angusj.com/delphi/clipper.php" });
--- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
+++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
@ -117,7 +117,7 @@ UM.Dialog
                        height: childrenRect.height
                        Label
                        {
-                            text: catalog.i18nc("@action:label", Cura.MachineManager.activeMachineNetworkGroupName != "" ? "Printer Group" : "Name")
+                            text: Cura.MachineManager.activeMachineNetworkGroupName != "" ? catalog.i18nc("@action:label", "Printer Group") : catalog.i18nc("@action:label", "Name")
                            width: Math.floor(scroll.width / 3) | 0
                        }
                        Label
--- a/resources/qml/JobSpecs.qml
+++ b/resources/qml/JobSpecs.qml
@ -86,7 +86,7 @@ Item {
                    printJobTextfield.focus = false;
                }
                validator: RegExpValidator {
-                    regExp: /^[^\\ \/ \*\?\|\[\]]*$/
+                    regExp: /^[^\\\/\*\?\|\[\]]*$/
                }
                style: TextFieldStyle{
                    textColor: UM.Theme.getColor("text_scene");
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@ -171,7 +171,7 @@ UM.PreferencesPage
                            append({ text: "日本語", code: "ja_JP" })
                            append({ text: "한국어", code: "ko_KR" })
                            append({ text: "Nederlands", code: "nl_NL" })
-                            //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" })
+                            append({ text: "Polski", code: "pl_PL" })
                            append({ text: "Português do Brasil", code: "pt_BR" })
                            append({ text: "Português", code: "pt_PT" })
                            append({ text: "Русский", code: "ru_RU" })
--- a/resources/qml/Preferences/Materials/MaterialsSlot.qml
+++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml
@ -41,15 +41,7 @@ Rectangle
        anchors.left: swatch.right
        anchors.verticalCenter: materialSlot.verticalCenter
        anchors.leftMargin: UM.Theme.getSize("narrow_margin").width
-        font.italic:
-        {
-            var selected_material = Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex]
-            if(selected_material == material.root_material_id)
-            {
-                return true
-            }
-            return false
-        }
+        font.italic: Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex] == material.root_material_id
    }
    MouseArea
    {
--- a/resources/qml/PrintMonitor.qml
+++ b/resources/qml/PrintMonitor.qml
@ -44,7 +44,7 @@ Column
            Repeater
            {
                id: extrudersRepeater
-                model: activePrinter!=null ? activePrinter.extruders : null
+                model: activePrinter != null ? activePrinter.extruders : null

                ExtruderBox
                {
--- a/resources/qml/PrinterOutput/OutputDeviceHeader.qml
+++ b/resources/qml/PrinterOutput/OutputDeviceHeader.qml
@ -14,11 +14,19 @@ Item
    implicitHeight: Math.floor(childrenRect.height + UM.Theme.getSize("default_margin").height * 2)
    property var outputDevice: null

+    Connections
+    {
+        target: Cura.MachineManager
+        onGlobalContainerChanged:
+        {
+            outputDevice = Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null;
+        }
+    }
+
    Rectangle
    {
        height: childrenRect.height
        color: UM.Theme.getColor("setting_category")
-        property var activePrinter: outputDevice != null ? outputDevice.activePrinter : null

        Label
        {
@ -28,7 +36,7 @@ Item
            anchors.left: parent.left
            anchors.top: parent.top
            anchors.margins: UM.Theme.getSize("default_margin").width
-            text: outputDevice != null ? activePrinter.name : ""
+            text: outputDevice != null ? outputDevice.activePrinter.name : ""
        }

        Label
--- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg
+++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg
@ -25,7 +25,6 @@ support_angle = 60
 support_enable = True
 support_interface_enable = True
 support_pattern = triangles
-support_roof_enable = True
 support_type = everywhere
 support_use_towers = False
 support_xy_distance = 0.7
--- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg
+++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg
@ -25,7 +25,6 @@ support_angle = 60
 support_enable = True
 support_interface_enable = True
 support_pattern = triangles
-support_roof_enable = True
 support_type = everywhere
 support_use_towers = False
 support_xy_distance = 0.7
--- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg
+++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg
@ -25,7 +25,6 @@ support_angle = 60
 support_enable = True
 support_interface_enable = True
 support_pattern = triangles
-support_roof_enable = True
 support_type = everywhere
 support_use_towers = False
 support_xy_distance = 0.7