From 86875580afa00e931dead827b631135434de1dbc Mon Sep 17 00:00:00 2001
From: 10r3n20 <l.romagnoli@ultimaker.com>
Date: Tue, 26 Oct 2021 13:01:15 +0200
Subject: [PATCH 1/3] add dark themed images to the dark theme

---
 .../images/first_run_ultimaker_cloud.svg      | 36 +++++++++++++++++++
 .../themes/cura-dark/images/welcome_cura.svg  | 27 ++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 resources/themes/cura-dark/images/first_run_ultimaker_cloud.svg
 create mode 100644 resources/themes/cura-dark/images/welcome_cura.svg

diff --git a/resources/themes/cura-dark/images/first_run_ultimaker_cloud.svg b/resources/themes/cura-dark/images/first_run_ultimaker_cloud.svg
new file mode 100644
index 0000000000..8cd749305e
--- /dev/null
+++ b/resources/themes/cura-dark/images/first_run_ultimaker_cloud.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 325.5 197.2" style="enable-background:new 0 0 325.5 197.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#555557;stroke:#F3F3F3;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:#1F1F20;}
+	.st2{fill:#F3F3F3;}
+	.st3{fill:#555557;}
+	.st4{fill:none;stroke:#F3F3F3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
+	.st5{fill:none;stroke:#F3F3F3;stroke-width:2;stroke-miterlimit:10;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#F3F3F3;}
+</style>
+<path class="st0" d="M47.7,9.3h230.1c3.4,0,6.1,2.7,6.1,6.1c0,0,0,0,0,0v157.1l0,0H41.6l0,0V15.4C41.6,12,44.3,9.3,47.7,9.3
+	C47.7,9.3,47.7,9.3,47.7,9.3z"/>
+<path class="st1" d="M50.9,173.6c-0.6,0-1-0.4-1-1V19.7c0-1.1,0.9-2,2-2h220.7c1.7,0,3,1.3,3,3v151.9c0,0.6-0.4,1-1,1H50.9z"/>
+<path class="st2" d="M272.6,18.6c1.1,0,2,0.9,2,2v151.9H50.9V19.6c0-0.6,0.4-1,1-1H272.6 M272.6,16.6H51.9c-1.7,0-3,1.3-3,3v152.9
+	c0,1.1,0.9,2,2,2h223.7c1.1,0,2-0.9,2-2V20.6C276.6,18.4,274.8,16.6,272.6,16.6z"/>
+<path class="st3" d="M272.6,20.6v149.9H52.9V20.6H272.6 M272.6,18.6H51.9c-0.6,0-1,0.4-1,1v152.9h223.7V20.6
+	C274.6,19.5,273.7,18.6,272.6,18.6z"/>
+<line class="st4" x1="14.6" y1="187.9" x2="310.9" y2="187.9"/>
+<path class="st3" d="M35.3,187.9c-8.5,0-15.5-6.9-15.5-15.5c0-0.6,0.4-1,1-1h283.8c0.6,0,1,0.4,1,1c0,8.5-6.9,15.5-15.5,15.5H35.3z"
+	/>
+<path class="st2" d="M304.6,172.4L304.6,172.4c0,8-6.5,14.5-14.5,14.5c0,0,0,0,0,0H35.3c-8,0-14.5-6.5-14.5-14.5H304.6 M304.6,170.4
+	H20.9c-1.1,0-2,0.9-2,2c0,9.1,7.4,16.5,16.5,16.5h254.8c9.1,0,16.5-7.4,16.5-16.5C306.6,171.3,305.7,170.4,304.6,170.4z"/>
+<path class="st2" d="M185.2,172.4h-45v0.6c0,2.4,2,4.4,4.4,4.4h36.2c2.4,0,4.4-2,4.4-4.4V172.4z"/>
+<polygon class="st5" points="180.2,140.5 117.4,140.5 117.4,77.7 144.3,50.8 207.2,50.8 207.2,113.6 "/>
+<path class="st5" d="M175.7,73.2h-13.5c-12.4-0.3-22.6,9.6-22.9,22c-0.3,12.4,9.6,22.6,22,22.9c0.3,0,0.6,0,0.9,0h13.5"/>
+<circle class="st1" cx="207.2" cy="50.8" r="31"/>
+<path class="st6" d="M206.7,28.1c-12.4,0-22.4,10.1-22.3,22.4s10.1,22.4,22.4,22.3c12.4,0,22.3-10,22.3-22.4
+	C229.2,38.2,219.1,28.1,206.7,28.1C206.7,28.1,206.7,28.1,206.7,28.1z M192.7,65.1c6.2-7.7,17.5-8.9,25.2-2.7c1,0.8,1.9,1.7,2.7,2.7
+	C212.9,72.6,200.6,72.6,192.7,65.1L192.7,65.1z M197.2,46.6c0-5.3,4.2-9.5,9.5-9.5s9.5,4.2,9.5,9.5c0,5.3-4.2,9.5-9.5,9.5
+	c0,0,0,0,0,0C201.5,56.1,197.2,51.8,197.2,46.6L197.2,46.6z M222.2,63.4c-2.6-3.1-6-5.4-9.9-6.5c5.7-3.1,7.9-10.2,4.8-16
+	c-3.1-5.7-10.2-7.9-16-4.8s-7.9,10.2-4.8,16c1.1,2,2.7,3.7,4.8,4.8c-3.9,1.1-7.3,3.4-9.9,6.5c-7.1-8.5-6-21.2,2.6-28.4
+	s21.2-6,28.4,2.6C228.4,45.1,228.4,55.9,222.2,63.4z"/>
+</svg>
diff --git a/resources/themes/cura-dark/images/welcome_cura.svg b/resources/themes/cura-dark/images/welcome_cura.svg
new file mode 100644
index 0000000000..f92f032a2a
--- /dev/null
+++ b/resources/themes/cura-dark/images/welcome_cura.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 325.5 197.2" style="enable-background:new 0 0 325.5 197.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#555557;stroke:#F3F3F3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
+	.st1{fill:#1F1F20;}
+	.st2{fill:none;stroke:#F3F3F3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
+	.st3{fill:#F3F3F3;}
+	.st4{fill:none;stroke:#F3F3F3;stroke-width:2;stroke-linecap:round;}
+</style>
+<g>
+	<path class="st0" d="M47.7,9.3h230.1c3.4,0,6.1,2.7,6.1,6.1v157.1c0,3.4-2.7,6.1-6.1,6.1H47.7c-3.4,0-6.1-2.7-6.1-6.1V15.4
+		C41.6,12,44.3,9.3,47.7,9.3z"/>
+	<rect x="52.9" y="20.6" class="st1" width="219.7" height="155.9"/>
+	<path class="st2" d="M51.9,17.6h221.7c1.1,0,2,0.9,2,2v151.9c0,1.1-0.9,2-2,2H51.9c-1.1,0-2-0.9-2-2V19.6
+		C49.9,18.5,50.8,17.6,51.9,17.6z"/>
+	<line class="st2" x1="14.6" y1="187.9" x2="310.9" y2="187.9"/>
+	<path class="st0" d="M305.6,172.4c0,8.5-6.9,15.5-15.5,15.5l0,0H35.3c-8.5,0-15.5-6.9-15.5-15.5c0-0.6,0.4-1,1-1h283.8
+		C305.2,171.4,305.6,171.9,305.6,172.4z"/>
+</g>
+<path class="st3" d="M185.2,172.4h-45v0.6c0,2.4,2,4.4,4.4,4.4h36.2c2.4,0,4.4-2,4.4-4.4L185.2,172.4z"/>
+<g>
+	<polygon class="st4" points="180.2,140.5 117.4,140.5 117.4,77.7 144.3,50.8 207.2,50.8 207.2,113.6 	"/>
+	<path class="st4" d="M175.7,73.2h-13.5c-12.4-0.3-22.6,9.6-22.9,22c-0.3,12.4,9.6,22.6,22,22.9c0.3,0,0.6,0,0.9,0h13.5"/>
+</g>
+</svg>

From 87db24f14c162f48c69556eed4a8cbf679b0db34 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 29 Oct 2021 10:39:00 +0200
Subject: [PATCH 2/3] Don't check validation for settings in error state

CURA-8656
---
 plugins/CuraEngineBackend/StartSliceJob.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 9e53ce8b3a..7e01e96b06 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -123,6 +123,9 @@ class StartSliceJob(Job):
             Job.yieldThread()
 
         for changed_setting_key in changed_setting_keys:
+            if not stack.getProperty(changed_setting_key, "enabled"):
+                continue
+
             validation_state = stack.getProperty(changed_setting_key, "validationState")
 
             if validation_state is None:

From 67d76e3af8024e96940a263bce888199f3e82bc3 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 1 Nov 2021 11:50:24 +0100
Subject: [PATCH 3/3] Change version in citation file to 4.12

---
 CITATION.cff | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index 808a403e1a..b97fdf7c49 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -7,5 +7,5 @@ license: "LGPL-3.0"
 message: "If you use this software, please cite it using these metadata."
 repository-code: "https://github.com/ultimaker/cura/"
 title: "Ultimaker Cura"
-version: "4.10.0"
-...
\ No newline at end of file
+version: "4.12.0"
+...