From 6c2878221d18c23277e8421a488a8a8fb532b13b Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Mar 2016 10:49:09 +0100
Subject: [PATCH 1/7] Removed color from convex hull node when it has profile /
 setting

CURA-1251
---
 cura/ConvexHullNode.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cura/ConvexHullNode.py b/cura/ConvexHullNode.py
index 7f0f87ade5..107dbebe5c 100644
--- a/cura/ConvexHullNode.py
+++ b/cura/ConvexHullNode.py
@@ -91,8 +91,4 @@ class ConvexHullNode(SceneNode):
         if not node:
             return
 
-        if node.hasDecoration("getProfile"):
-            self._color.setR(0.75)
-
-        if node.hasDecoration("getSetting"):
-            self._color.setG(0.75)
+        
\ No newline at end of file

From 99de21fba77e8766ea74b4f18a2e15751912ebff Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Mar 2016 10:59:11 +0100
Subject: [PATCH 2/7] Setting one at a time mode now decreases size of build
 volume

CURA-1245 CURA-1224
---
 cura/BuildVolume.py     | 17 ++++++++++++++---
 cura/ConvexHullNode.py  |  4 +---
 cura/PlatformPhysics.py |  5 -----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py
index 8750cbe03f..cc1411e52d 100644
--- a/cura/BuildVolume.py
+++ b/cura/BuildVolume.py
@@ -165,7 +165,10 @@ class BuildVolume(SceneNode):
 
         if self._active_instance:
             self._width = self._active_instance.getMachineSettingValue("machine_width")
-            self._height = self._active_instance.getMachineSettingValue("machine_height")
+            if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time":
+                self._height = Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height")
+            else:
+                self._height = self._active_instance.getMachineSettingValue("machine_depth")
             self._depth = self._active_instance.getMachineSettingValue("machine_depth")
 
             self._updateDisallowedAreas()
@@ -182,11 +185,19 @@ class BuildVolume(SceneNode):
             self._updateDisallowedAreas()
             self.rebuild()
 
-    def _onSettingValueChanged(self, setting):
-        if setting in self._skirt_settings:
+    def _onSettingValueChanged(self, setting_key):
+        if setting_key == "print_sequence":
+            if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time":
+                self._height = Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height")
+            else:
+                self._height = self._active_instance.getMachineSettingValue("machine_depth")
+            self.rebuild()
+        if setting_key in self._skirt_settings:
             self._updateDisallowedAreas()
             self.rebuild()
 
+
+
     def _updateDisallowedAreas(self):
         if not self._active_instance or not self._active_profile:
             return
diff --git a/cura/ConvexHullNode.py b/cura/ConvexHullNode.py
index 107dbebe5c..dc02a97dc6 100644
--- a/cura/ConvexHullNode.py
+++ b/cura/ConvexHullNode.py
@@ -89,6 +89,4 @@ class ConvexHullNode(SceneNode):
         self._color = Color(35, 35, 35, 0.5)
 
         if not node:
-            return
-
-        
\ No newline at end of file
+            return
\ No newline at end of file
diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py
index 95951f78dd..5299f4c5d0 100644
--- a/cura/PlatformPhysics.py
+++ b/cura/PlatformPhysics.py
@@ -65,11 +65,6 @@ class PlatformPhysics:
             # Mark the node as outside the build volume if the bounding box test fails.
             if build_volume_bounding_box.intersectsBox(bbox) != AxisAlignedBox.IntersectionResult.FullIntersection:
                 node._outside_buildarea = True
-            else:
-                # When printing one at a time too high objects are not printable.
-                if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time":
-                    if node.getBoundingBox().height > Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height"):
-                        node._outside_buildarea = True
 
             # Move it downwards if bottom is above platform
             move_vector = Vector()

From 918d8005bce017013e2074d4a7a8e840d44f9677 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Mar 2016 13:59:43 +0100
Subject: [PATCH 3/7] Removing unneeded overwritten settings

---
 resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile | 1 -
 resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile    | 1 -
 resources/profiles/ultimaker2+/abs_0.4_high.curaprofile    | 1 -
 resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile  | 1 -
 resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile  | 1 -
 resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile | 1 -
 resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile    | 2 --
 resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile    | 1 -
 resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile  | 2 --
 resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile  | 1 -
 resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile  | 2 --
 resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 -
 resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile    | 1 -
 resources/profiles/ultimaker2+/pla_0.4_high.curaprofile    | 1 -
 resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile  | 2 --
 resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile    | 1 -
 resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile  | 2 --
 resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile  | 1 -
 18 files changed, 23 deletions(-)

diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
index a313dea610..15632a183b 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
@@ -17,7 +17,6 @@ layer_height_0 = 0.15
 speed_layer_0 = 20
 speed_infill = 30
 speed_topbottom = 20
-speed_wall_0 = 20
 speed_wall_x = 25
 cool_min_layer_time = 2
 cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
index effb1ce35a..03c5cad45f 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@@ -19,7 +19,6 @@ speed_travel = 150
 speed_infill = 55
 speed_topbottom = 30
 speed_wall_0 = 30
-speed_wall_x = 40
 cool_min_layer_time = 3
 cool_min_speed = 20
 cool_lift_head = True
diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
index c4e256e088..30867e8605 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@@ -18,7 +18,6 @@ speed_layer_0 = 20
 speed_infill = 45
 speed_topbottom = 20
 speed_wall_0 = 20
-speed_wall_x = 30
 cool_min_layer_time = 3
 cool_min_speed = 10
 cool_fan_speed_min = 20
diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
index d409d8ac5c..a073713649 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@@ -18,7 +18,6 @@ speed_layer_0 = 20
 speed_infill = 45
 speed_topbottom = 20
 speed_wall_0 = 20
-speed_wall_x = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
 cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
index 60eee772b1..7851f82cee 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
@@ -17,7 +17,6 @@ layer_height_0 = 0.5
 speed_layer_0 = 20
 speed_infill = 40
 speed_topbottom = 20
-speed_wall_0 = 20
 speed_wall_x = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
index fba8e96cd7..7003b825b5 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
@@ -17,7 +17,6 @@ layer_height_0 = 0.15
 speed_layer_0 = 20
 speed_infill = 30
 speed_topbottom = 20
-speed_wall_0 = 20
 speed_wall_x = 25
 cool_min_layer_time = 2
 cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
index 649a43827d..41da312634 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@@ -17,9 +17,7 @@ layer_height_0 = 0.26
 speed_travel = 150
 speed_layer_0 = 30
 speed_infill = 45
-speed_topbottom = 20
 speed_wall_0 = 30
-speed_wall_x = 40
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
 cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
index 81a1956ce1..bfa93ff46c 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@@ -17,7 +17,6 @@ layer_height_0 = 0.26
 speed_layer_0 = 20
 speed_infill = 45
 speed_topbottom = 20
-speed_wall_0 = 20
 speed_wall_x = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
index dac242098d..b725a17713 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@@ -7,11 +7,9 @@ material = CPE
 weight = -2
 
 [settings]
-layer_height = 0.1
 wall_thickness = 1.05
 line_width = 0.35
 top_bottom_thickness = 0.8
-infill_sparse_density = 20
 speed_print = 30
 layer_height_0 = 0.26
 speed_layer_0 = 20
diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
index bbeffc9659..e45bf7ef3f 100644
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@@ -11,7 +11,6 @@ layer_height = 0.15
 wall_thickness = 1.59
 line_width = 0.53
 top_bottom_thickness = 1.2
-infill_sparse_density = 20
 speed_print = 25
 layer_height_0 = 0.4
 speed_layer_0 = 20
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
index b73869646d..19cbc9a18e 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
@@ -11,13 +11,11 @@ layer_height = 0.2
 wall_thickness = 2.1
 line_width = 0.7
 top_bottom_thickness = 1.2
-infill_sparse_density = 20
 speed_print = 20
 layer_height_0 = 0.5
 speed_layer_0 = 20
 speed_infill = 40
 speed_topbottom = 20
-speed_wall_0 = 20
 speed_wall_x = 30
 cool_min_layer_time = 3
 cool_min_speed = 10
diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
index e127b04c41..8eacab211f 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@@ -16,7 +16,6 @@ infill_sparse_density = 22
 retraction_amount = 6
 speed_print = 20
 speed_infill = 30
-speed_wall_0 = 20
 speed_wall_x = 25
 speed_topbottom = 20
 speed_layer_0 = 25
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index b22032b7ed..f2051858cb 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -16,7 +16,6 @@ infill_sparse_density = 18
 retraction_amount = 5.5
 speed_print = 40
 speed_infill = 60
-speed_wall_0 = 40
 speed_wall_x = 50
 speed_travel = 150
 speed_topbottom = 30
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index e0b85b137c..3889ff5da0 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -16,7 +16,6 @@ infill_sparse_density = 22
 retraction_amount = 5.5
 speed_print = 30
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index 3e2c39ed82..174cc9d947 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -8,7 +8,6 @@ weight = -2
 
 [settings]
 line_width = 0.35
-layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
@@ -16,7 +15,6 @@ infill_sparse_density = 20
 retraction_amount = 5.5
 speed_print = 30
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
index b825f62e47..72388e94b6 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@@ -17,7 +17,6 @@ retraction_amount = 5.5
 retraction_extrusion_window = 6
 speed_print = 30
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 256fa3070e..4e86a6aab2 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -12,11 +12,9 @@ layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
-infill_sparse_density = 20
 retraction_amount = 6
 speed_print = 25
 speed_infill = 55
-speed_wall_0 = 25
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
index be9d2a512d..6a34ecb59c 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@@ -16,7 +16,6 @@ infill_sparse_density = 20
 retraction_amount = 6
 speed_print = 20
 speed_infill = 40
-speed_wall_0 = 20
 speed_wall_x = 30
 speed_topbottom = 20
 speed_layer_0 = 25

From 637f793f48d2f53e7ee6f1b71068a247dce734bb Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Mar 2016 14:03:49 +0100
Subject: [PATCH 4/7] Simplified some of the inheritance functions

---
 resources/machines/fdmprinter.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index f83b1e6807..78a98394ae 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -857,7 +857,7 @@
                             "max_value_warning": "150",
                             "default": 30,
                             "visible": false,
-                            "inherit_function": "parent_value / 60 * 30",
+                            "inherit_function": "parent_value / 2",
                             "children": {
                                 "speed_wall_0": {
                                     "label": "Outer Wall Speed",
@@ -878,7 +878,7 @@
                                     "max_value_warning": "150",
                                     "default": 60,
                                     "visible": false,
-                                    "inherit_function": "speed_print"
+                                    "inherit_function": "parent_value * 2"
                                 }
                             }
                         },
@@ -891,7 +891,7 @@
                             "max_value_warning": "150",
                             "default": 30,
                             "visible": false,
-                            "inherit_function": "parent_value / 60 * 30"
+                            "inherit_function": "parent_value / 2"
                         },
                         "speed_support": {
                             "label": "Support Speed",
@@ -928,7 +928,7 @@
                                     "max_value_warning": "150",
                                     "visible": false,
                                     "enabled": "support_roof_enable",
-                                    "inherit_function": "parent_value / 60 * 40",
+                                    "inherit_function": "parent_value / 1.5",
                                     "global_only": true
                                 }
                             }

From 89162e328624accf44339fae9722f0fd08d9c4cb Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Mar 2016 14:08:50 +0100
Subject: [PATCH 5/7] Fixed crash caused by circular dependency

---
 resources/machines/fdmprinter.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index 78a98394ae..b413492a44 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -1095,7 +1095,6 @@
                             "unit": "%",
                             "type": "float",
                             "min_value": "0",
-                            "max_value": "min(100, cool_fan_speed_max)",
                             "inherit_function": "parent_value",
                             "default": 100,
                             "visible": false,

From 51b9ac78bdd51c9532a38fac064ffdbb68addaa0 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Mar 2016 15:18:18 +0100
Subject: [PATCH 6/7] Added speed of light as max value for speed

CURA-1252
---
 resources/machines/fdmprinter.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index b413492a44..f84a899d37 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -836,6 +836,7 @@
                     "type": "float",
                     "min_value": "0.1",
                     "max_value_warning": "150",
+                    "max_value": "299792458000",
                     "default": 60,
                     "children": {
                         "speed_infill": {

From 7e339ce512e42b4036016e38564bd6f20b772fe2 Mon Sep 17 00:00:00 2001
From: Thomas-Karl Pietrowski <thopiekar@googlemail.com>
Date: Tue, 29 Mar 2016 10:16:50 +0200
Subject: [PATCH 7/7] CMake: Remove all slashes from language codes Related to:
 https://github.com/Ultimaker/Uranium/pull/119/commits/6833363b531c265ef17f78055c9ed8d6e546e914

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb6a72bd1d..dc9f37c76e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ MACRO(SUBDIRLIST result curdir)
   SET(dirlist "")
   FOREACH(child ${children})
     IF(IS_DIRECTORY ${curdir}/${child})
+        STRING(REPLACE "/" "" child ${child})
         LIST(APPEND dirlist ${child})
     ENDIF()
   ENDFOREACH()