Merge pull request #268 from Ultimaker/CURA-11291-Turn-on-prime-tower…

…-when-support-disabled CURA-11291 Turn on prime tower even when support is disabled
Ultimaker · Nov 10, 2023 · 65cdeb1 · 65cdeb1
2 parents 0a8dc75 + 071b380
commit 65cdeb1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -22,7 +22,7 @@ class FDM_MaterialsConan(ConanFile):
 
     def set_version(self):
         if not self.version:
-            self.version = "5.5.0-beta.2"
+            self.version = "5.6.0-beta.1"
 
     def export_sources(self):
         copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder)

diff --git a/ultimaker_abscf_175.xml.fdm_material b/ultimaker_abscf_175.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Generic</color>
         </name>
         <GUID>495a0ce5-9daf-4a16-b7b2-06856d82394d</GUID>
-        <version>3</version>
+        <version>4</version>
         <color_code>#0e0e10</color_code>
         <description>The performance of carbon fiber with the reliability of ABS</description>
         <adhesion_info>No glue needed</adhesion_info>
@@ -26,7 +26,7 @@
         <setting key="build volume temperature">107</setting>
 
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method X"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
             <hotend id="1A">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -47,7 +47,7 @@
             </hotend>
         </machine>
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method XL"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL"/>
             <setting key="build volume temperature">85</setting>
             <setting key="heated bed temperature">95</setting>
             <hotend id="1A">

diff --git a/ultimaker_absr_175.xml.fdm_material b/ultimaker_absr_175.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Generic</color>
         </name>
         <GUID>88c8919c-6a09-471a-b7b6-e801263d862d</GUID>
-        <version>3</version>
+        <version>4</version>
         <color_code>#8cb219</color_code>
         <description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
         <adhesion_info>No glue needed</adhesion_info>
@@ -26,7 +26,7 @@
         <setting key="build volume temperature">107</setting>
 
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method X"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
             <hotend id="1A">
                 <setting key="hardware compatible">no</setting>
             </hotend>
@@ -47,7 +47,7 @@
             </hotend>
         </machine>
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method XL"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL"/>
             <setting key="build volume temperature">85</setting>
             <setting key="heated bed temperature">95</setting>
             <hotend id="1A">

diff --git a/ultimaker_rapidrinse_175.xml.fdm_material b/ultimaker_rapidrinse_175.xml.fdm_material
@@ -7,7 +7,7 @@
             <color>Generic</color>
         </name>
         <GUID>a140ef8f-4f26-4e73-abe0-cfc29d6d1024</GUID>
-        <version>3</version>
+        <version>5</version>
         <color_code>#f5f2d1</color_code>
         <description>Water soluble support material for ABS-R.</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -28,12 +28,12 @@
 
         <!-- Define as soluble support material -->
         <cura:setting key="material_is_support_material">True</cura:setting>
-        <cura:setting key="prime_tower_enable">=extruder_nr==support_extruder_nr and support_enable</cura:setting>
+        <cura:setting key="prime_tower_enable">=extruder_nr==support_extruder_nr</cura:setting>
         <cura:setting key="support_conical_enabled">True</cura:setting>
 
         <machine>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method X"/>
-            <machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method XL"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL"/>
             <hotend id="1A">
                 <setting key="hardware compatible">no</setting>
             </hotend>