Merge branch 'master' into clean-up-bot-luts

Ultimaker · Nov 29, 2023 · cff29a9 · cff29a9
2 parents 0183355 + 7280cb8
commit cff29a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/ultimaker_abscf_175.xml.fdm_material b/ultimaker_abscf_175.xml.fdm_material
@@ -8,7 +8,7 @@
         </name>
         <GUID>495a0ce5-9daf-4a16-b7b2-06856d82394d</GUID>
         <reference_material_id>abs-cf10</reference_material_id>
-        <version>4</version>
+        <version>5</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>
@@ -25,6 +25,8 @@
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
         <setting key="build volume temperature">107</setting>
+        <cura:setting key="material_shrinkage_percentage">100.16</cura:setting>
+        <cura:setting key="material_shrinkage_percentage_z">100.68</cura:setting>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
@@ -43,10 +45,11 @@
             <hotend id="1C">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
-            <hotend id="Lab">
+            <hotend id="LABS">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL"/>
             <setting key="build volume temperature">85</setting>
@@ -66,7 +69,7 @@
             <hotend id="1C">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
-            <hotend id="Lab">
+            <hotend id="LABS">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
         </machine>

diff --git a/ultimaker_absr_175.xml.fdm_material b/ultimaker_absr_175.xml.fdm_material
@@ -8,7 +8,7 @@
         </name>
         <GUID>88c8919c-6a09-471a-b7b6-e801263d862d</GUID>
         <reference_material_id>abs-wss1</reference_material_id>
-        <version>4</version>
+        <version>5</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>
@@ -25,6 +25,8 @@
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
         <setting key="build volume temperature">107</setting>
+        <cura:setting key="material_shrinkage_percentage">100.57</cura:setting>
+        <cura:setting key="material_shrinkage_percentage_z">100.59</cura:setting>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
@@ -43,7 +45,7 @@
             <hotend id="1C">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
-            <hotend id="Lab">
+            <hotend id="LABS">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
         </machine>
@@ -66,7 +68,7 @@
             <hotend id="1C">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
-            <hotend id="Lab">
+            <hotend id="LABS">
                 <setting key="hardware compatible">yes</setting>
             </hotend>
         </machine>

diff --git a/ultimaker_rapidrinse_175.xml.fdm_material b/ultimaker_rapidrinse_175.xml.fdm_material
@@ -8,7 +8,7 @@
         </name>
         <GUID>a140ef8f-4f26-4e73-abe0-cfc29d6d1024</GUID>
         <reference_material_id>wss1</reference_material_id>
-        <version>5</version>
+        <version>6</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>
@@ -29,7 +29,7 @@
 
         <!-- 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</cura:setting>
+        <cura:setting key="prime_tower_enable">=extruder_nr==support_extruder_nr or extruder_nr==raft_base_extruder_nr or extruder_nr==raft_interface_extruder_nr or extruder_nr==raft_surface_extruder_nr</cura:setting>
         <cura:setting key="support_conical_enabled">True</cura:setting>
 
         <machine>
@@ -50,10 +50,9 @@
             <hotend id="1C">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="Lab">
+            <hotend id="LABS">
                 <setting key="hardware compatible">no</setting>
             </hotend>
         </machine>
-
     </settings>
 </fdmmaterial>