Browse Source

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

Jaime van Kessel 8 years ago
parent
commit
2cf82d1b0b
2 changed files with 2 additions and 2 deletions
  1. 1 1
      resources/definitions/fdmprinter.def.json
  2. 1 1
      resources/qml/SidebarSimple.qml

+ 1 - 1
resources/definitions/fdmprinter.def.json

@@ -1806,7 +1806,7 @@
                         "speed_travel_layer_0":
                         {
                             "label": "Initial Layer Travel Speed",
-                            "description": "The speed of travel moves in the initial layer. A lower value is advised to prevent pulling previously printed parts away from the build plate.",
+                            "description": "The speed of travel moves in the initial layer. A lower value is advised to prevent pulling previously printed parts away from the build plate. The value of this setting can automatically be calculated from the ratio between the Travel Speed and the Print Speed.",
                             "unit": "mm/s",
                             "type": "float",
                             "default_value": 60,

+ 1 - 1
resources/qml/SidebarSimple.qml

@@ -337,7 +337,7 @@ Item
             enabled: base.settingsEnabled
             property alias _hovered: supportExtruderMouseArea.containsMouse
 
-            currentIndex: parseFloat(supportExtruderNr.properties.value)
+            currentIndex: supportExtruderNr.properties !== null ? parseFloat(supportExtruderNr.properties.value) : 0
             onActivated:
             {
                 // Send the extruder nr as a string.