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

cura_app.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2015 Ultimaker B.V.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import argparse
@@ -27,7 +27,7 @@ known_args = vars(parser.parse_known_args()[0])
 if not known_args["debug"]:
     def get_cura_dir_path():
         if Platform.isWindows():
-            return os.path.expanduser("~/AppData/Roaming/cura/")
+            return os.path.expanduser("~/AppData/Roaming/cura")
         elif Platform.isLinux():
             return os.path.expanduser("~/.local/share/cura")
         elif Platform.isOSX():

resources/qml/WorkspaceSummaryDialog.qml

@@ -150,7 +150,20 @@ UM.Dialog
                         width: parent.width
                          Label
                         {
-                            text: catalog.i18nc("@action:label", "Extruder %1").arg(modelData)
+                            text: {
+                                var extruder = Number(modelData)
+                                var extruder_id = ""
+                                if(!isNaN(extruder))
+                                {
+                                    extruder_id = extruder + 1 // The extruder counter start from One and not Zero
+                                }
+                                else
+                                {
+                                    extruder_id = modelData
+                                }
+
+                                return catalog.i18nc("@action:label", "Extruder %1").arg(extruder_id)
+                            }
                             font.bold: true
                         }
                         Row

resources/setting_visibility/basic.cfg

@@ -34,6 +34,7 @@ retraction_hop_enabled
 
 [cooling]
 cool_fan_enabled
+cool_fan_speed
 
 [support]
 support_enable