From a969d3c5eab54fc904b37611029a704c24c4a120 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 29 May 2018 14:37:13 +0200
Subject: [PATCH 1/4] CURA-5404 Remove retraction_amount values that must be in
 the material profile.

---
 resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg | 1 -
 resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg | 1 -
 resources/variants/ultimaker3_aa0.8.inst.cfg                   | 1 -
 resources/variants/ultimaker3_aa04.inst.cfg                    | 1 -
 resources/variants/ultimaker3_bb0.8.inst.cfg                   | 1 -
 resources/variants/ultimaker3_bb04.inst.cfg                    | 1 -
 resources/variants/ultimaker3_extended_aa0.8.inst.cfg          | 1 -
 resources/variants/ultimaker3_extended_aa04.inst.cfg           | 1 -
 resources/variants/ultimaker3_extended_bb0.8.inst.cfg          | 1 -
 resources/variants/ultimaker3_extended_bb04.inst.cfg           | 1 -
 resources/variants/ultimaker_s5_aa0.8.inst.cfg                 | 1 -
 resources/variants/ultimaker_s5_aa04.inst.cfg                  | 1 -
 resources/variants/ultimaker_s5_bb0.8.inst.cfg                 | 1 -
 resources/variants/ultimaker_s5_bb04.inst.cfg                  | 1 -
 14 files changed, 14 deletions(-)

diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
index 4ea3552891..ff64790c96 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
@@ -40,7 +40,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
-retraction_amount = 6.5
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
index f0a889c12e..316161db32 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -39,7 +39,6 @@ material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
-retraction_amount = 7
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index 025c346377..ee0aad9819 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -41,7 +41,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = True
-retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index 84b137df60..0cc652d29e 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -22,7 +22,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_amount = 6.5
 retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 32f9dc6fd2..5e19f2b259 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -54,7 +54,6 @@ raft_interface_thickness = 0.2
 raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
-retraction_amount = 4.5
 retraction_count_max = 15
 retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 8c94ce1e19..6fc83310f9 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -27,7 +27,6 @@ prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
-retraction_amount = 4.5
 retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index ea2e92478a..16c857b2d5 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -41,7 +41,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = True
-retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index e653616c89..215c08337d 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -22,7 +22,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_amount = 6.5
 retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index da47f6eb28..995d2a8d2e 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -54,7 +54,6 @@ raft_interface_thickness = 0.2
 raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
-retraction_amount = 4.5
 retraction_count_max = 15
 retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index 04e625f87e..f9c31e9ef6 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -27,7 +27,6 @@ prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
-retraction_amount = 4.5
 retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index 71b1f2f003..d88cb87e1d 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -41,7 +41,6 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = =not magic_spiralize
-retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 9c3b5934ee..616b433658 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -22,7 +22,6 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
-retraction_amount = 6.5
 retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index 0c77d42e7e..e1d08591d9 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -54,7 +54,6 @@ raft_interface_thickness = 0.2
 raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
-retraction_amount = 4.5
 retraction_count_max = 15
 retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 76b609249a..f769cae63e 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -27,7 +27,6 @@ prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
-retraction_amount = 4.5
 retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width

From 9873d5728646b7f711f9ce4e53fa0cc38f41fc20 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 29 May 2018 14:48:34 +0200
Subject: [PATCH 2/4] CURA-5404 Change default retraction distance to 6.5mm for
 ultimaker3 and S5

---
 resources/definitions/ultimaker3.def.json   | 2 +-
 resources/definitions/ultimaker_s5.def.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 64948b4fe9..08fe01a76b 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -122,7 +122,7 @@
         "raft_jerk": { "value": "jerk_layer_0" },
         "raft_margin": { "value": "10" },
         "raft_surface_layers": { "value": "1" },
-        "retraction_amount": { "value": "2" },
+        "retraction_amount": { "value": "6.5" },
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 8af77e22ac..f6971d0da3 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -119,7 +119,7 @@
         "raft_margin": { "value": "10" },
         "raft_speed": { "value": "25" },
         "raft_surface_layers": { "value": "1" },
-        "retraction_amount": { "value": "2" },
+        "retraction_amount": { "value": "6.5" },
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },

From 931d4716e11d4a61f92879e3f52732e42bfe4a65 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Wed, 30 May 2018 16:58:11 +0200
Subject: [PATCH 3/4] CURA-5404 Retrieve the material settings' values from the
 variant before retrieving it from the definition if there are not defined in
 the material.

---
 cura/Settings/MachineManager.py            |  9 +++++++++
 resources/qml/Preferences/MaterialView.qml | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index 78f462d8e9..1b7aef65d6 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -655,6 +655,15 @@ class MachineManager(QObject):
 
         return ""
 
+    @pyqtProperty(str, notify = activeVariantChanged)
+    def activeVariantId(self) -> str:
+        if self._active_container_stack:
+            variant = self._active_container_stack.variant
+            if variant:
+                return variant.getId()
+
+        return ""
+
     @pyqtProperty(str, notify = activeVariantChanged)
     def activeVariantBuildplateName(self) -> str:
         if self._global_container_stack:
diff --git a/resources/qml/Preferences/MaterialView.qml b/resources/qml/Preferences/MaterialView.qml
index ceb2ed12be..ad91f2ee9a 100644
--- a/resources/qml/Preferences/MaterialView.qml
+++ b/resources/qml/Preferences/MaterialView.qml
@@ -404,10 +404,17 @@ TabView
                         id: spinBox
                         anchors.left: label.right
                         value: {
+                            // In case the setting is not in the material...
                             if (!isNaN(parseFloat(materialPropertyProvider.properties.value)))
                             {
                                 return parseFloat(materialPropertyProvider.properties.value);
                             }
+                            // ... we search in the variant, and if it is not there...
+                            if (!isNaN(parseFloat(variantPropertyProvider.properties.value)))
+                            {
+                                return parseFloat(variantPropertyProvider.properties.value);
+                            }
+                            // ... then look in the definition container.
                             if (!isNaN(parseFloat(machinePropertyProvider.properties.value)))
                             {
                                 return parseFloat(machinePropertyProvider.properties.value);
@@ -431,6 +438,13 @@ TabView
                         key: model.key
                     }
                     UM.ContainerPropertyProvider
+                    {
+                        id: variantPropertyProvider
+                        containerId: Cura.MachineManager.activeVariantId
+                        watchedProperties: [ "value" ]
+                        key: model.key
+                    }
+                    UM.ContainerPropertyProvider
                     {
                         id: machinePropertyProvider
                         containerId: Cura.MachineManager.activeDefinitionId

From dfd9fc2ae99857871012cd7fd87d3483345326f5 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Mon, 4 Jun 2018 14:43:00 +0200
Subject: [PATCH 4/4] Revert "CURA-5404 Remove retraction_amount values that
 must be in the material"

This reverts commit a969d3c5eab54fc904b37611029a704c24c4a120.
---
 resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg | 1 +
 resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg | 1 +
 resources/variants/ultimaker3_aa0.8.inst.cfg                   | 1 +
 resources/variants/ultimaker3_aa04.inst.cfg                    | 1 +
 resources/variants/ultimaker3_bb0.8.inst.cfg                   | 1 +
 resources/variants/ultimaker3_bb04.inst.cfg                    | 1 +
 resources/variants/ultimaker3_extended_aa0.8.inst.cfg          | 1 +
 resources/variants/ultimaker3_extended_aa04.inst.cfg           | 1 +
 resources/variants/ultimaker3_extended_bb0.8.inst.cfg          | 1 +
 resources/variants/ultimaker3_extended_bb04.inst.cfg           | 1 +
 resources/variants/ultimaker_s5_aa0.8.inst.cfg                 | 1 +
 resources/variants/ultimaker_s5_aa04.inst.cfg                  | 1 +
 resources/variants/ultimaker_s5_bb0.8.inst.cfg                 | 1 +
 resources/variants/ultimaker_s5_bb04.inst.cfg                  | 1 +
 14 files changed, 14 insertions(+)

diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
index ff64790c96..4ea3552891 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
@@ -40,6 +40,7 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_size = 16
 prime_tower_wipe_enabled = True
+retraction_amount = 6.5
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
index 316161db32..f0a889c12e 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -39,6 +39,7 @@ material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
 prime_tower_wipe_enabled = True
+retraction_amount = 7
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.8
 retraction_extrusion_window = 1
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index ee0aad9819..025c346377 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -41,6 +41,7 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = True
+retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index 0cc652d29e..84b137df60 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -22,6 +22,7 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
+retraction_amount = 6.5
 retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 5e19f2b259..32f9dc6fd2 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -54,6 +54,7 @@ raft_interface_thickness = 0.2
 raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
+retraction_amount = 4.5
 retraction_count_max = 15
 retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 6fc83310f9..8c94ce1e19 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -27,6 +27,7 @@ prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
+retraction_amount = 4.5
 retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index 16c857b2d5..ea2e92478a 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -41,6 +41,7 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = True
+retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index 215c08337d..e653616c89 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -22,6 +22,7 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
+retraction_amount = 6.5
 retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index 995d2a8d2e..da47f6eb28 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -54,6 +54,7 @@ raft_interface_thickness = 0.2
 raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
+retraction_amount = 4.5
 retraction_count_max = 15
 retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index f9c31e9ef6..04e625f87e 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -27,6 +27,7 @@ prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
+retraction_amount = 4.5
 retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index d88cb87e1d..71b1f2f003 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -41,6 +41,7 @@ multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
 retract_at_layer_change = =not magic_spiralize
+retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 616b433658..9c3b5934ee 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -22,6 +22,7 @@ raft_interface_thickness = =layer_height * 1.5
 raft_jerk = =jerk_print
 raft_margin = 15
 raft_surface_layers = 2
+retraction_amount = 6.5
 retraction_count_max = 25
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index e1d08591d9..0c77d42e7e 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -54,6 +54,7 @@ raft_interface_thickness = 0.2
 raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
+retraction_amount = 4.5
 retraction_count_max = 15
 retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index f769cae63e..76b609249a 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -27,6 +27,7 @@ prime_tower_wall_thickness = 1.5
 raft_base_speed = 20
 raft_interface_speed = 20
 raft_speed = 25
+retraction_amount = 4.5
 retraction_count_max = 20
 retraction_extrusion_window = =retraction_amount
 retraction_min_travel = =3 * line_width