From e152fd641bee0558275afbce2acba7ae397c9519 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Wed, 6 Jun 2018 09:57:44 +0200
Subject: [PATCH 1/3] Remove trailing slash in Windows configuration path

It shouldn't matter, but we're getting crash reports from this path so let's try this.
---
 cura_app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cura_app.py b/cura_app.py
index 8a04b8fe09..d540c8a8c4 100755
--- a/cura_app.py
+++ b/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():

From dbd286e1cc1ad2404199b8daaaa598e3638f4f41 Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Wed, 6 Jun 2018 10:47:12 +0200
Subject: [PATCH 2/3] Save as project the extruder counter starts from 1

---
 resources/qml/WorkspaceSummaryDialog.qml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/resources/qml/WorkspaceSummaryDialog.qml b/resources/qml/WorkspaceSummaryDialog.qml
index 0869d7e698..079d840ae7 100644
--- a/resources/qml/WorkspaceSummaryDialog.qml
+++ b/resources/qml/WorkspaceSummaryDialog.qml
@@ -148,9 +148,22 @@ UM.Dialog
                     {
                         height: childrenRect.height
                         width: parent.width
-                        Label
+                         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

From da4932435c138c18feb8c0b0b572b43459654baa Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Wed, 6 Jun 2018 10:56:42 +0200
Subject: [PATCH 3/3] Add fan speed to basic setting visibility

It may not be what the users often want to change, but it is something that they may be expecting to see in the custom settings mode by default. It's something that you often think of as a typical setting but in reality you don't often want to change it. Let's get closer to what the user expects. Requested by the support team of Ultimaker.
---
 resources/setting_visibility/basic.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg
index 4196a3a9e7..82045db93b 100644
--- a/resources/setting_visibility/basic.cfg
+++ b/resources/setting_visibility/basic.cfg
@@ -34,6 +34,7 @@ retraction_hop_enabled
 
 [cooling]
 cool_fan_enabled
+cool_fan_speed
 
 [support]
 support_enable