Merge remote-tracking branch 'origin/master' into CURA-11622_conan_v2

Ultimaker · Nov 27, 2024 · 01b4897 · 01b4897
2 parents 13d941e + f26f09d
commit 01b4897
Show file tree

Hide file tree

Showing 99 changed files with 922 additions and 175 deletions.
diff --git a/basf_ultrafuse_316l_175.xml.fdm_material b/basf_ultrafuse_316l_175.xml.fdm_material
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
+    <metadata>
+        <name>
+            <brand>BASF</brand>
+            <material>Ultrafuse 316L</material>
+            <color>Generic</color>
+        </name>
+        <GUID>87cfe9c8-ea64-49c9-bf08-e4923c85fe7c</GUID>
+        <reference_material_id>ultrafuse-316l</reference_material_id>
+        <version>1</version>
+        <color_code>#78858B</color_code>
+        <description>Filament filled with metal powder. Debind and sointer to get final part.</description>
+        <adhesion_info>Print directly on the build surface with no raft or brims and support disabled</adhesion_info>
+    </metadata>
+    <properties>
+        <density>4</density>
+        <diameter>1.75</diameter>
+    </properties>
+    <settings>
+        <setting key="print temperature">245</setting>
+        <setting key="standby temperature">180</setting>
+        <setting key="retraction amount">0.75</setting>
+        <setting key="print cooling">0</setting>
+        <setting key="retraction speed">5</setting>
+        <cura:setting key="material_alternate_walls">yes</cura:setting>
+        <cura:setting key="material_shrinkage_percentage_z">126</cura:setting>
+        <cura:setting key="material_shrinkage_percentage_xy">120</cura:setting>
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method" />
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X" />
+            <setting key="build volume temperature">67</setting>
+            <hotend id="1A">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="1XA">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="2A">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="2XA">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="1C">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <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">60</setting>
+            <setting key="heated bed temperature">60</setting>
+            <hotend id="1A">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="1XA">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="2A">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="2XA">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="1C">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="LABS">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+
+    </settings>
+</fdmmaterial>
diff --git a/conandata.yml b/conandata.yml
@@ -1 +1 @@
-version: "5.9.0-alpha.0"
+version: "5.10.0-alpha.0"
diff --git a/eazao_clay.xml.fdm_material b/eazao_clay.xml.fdm_material
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fdmmaterial version="1.3" xmlns="http://www.ultimaker.com/material">
+    <metadata>
+        <name>
+            <brand>Eazao</brand>
+            <material>Clay</material>
+            <color>White</color>
+            <label>Clay</label>
+        </name>
+        <GUID>e0752072-a685-8721-dfd4-837075eb4f57</GUID>
+        <version>2</version>
+        <color_code>#eeeeee</color_code>
+        <description></description>
+        <adhesion_info></adhesion_info>
+    </metadata>
+    <properties>
+        <diameter>1.75</diameter>
+        <density>1600</density>
+        <weight>800</weight>
+    </properties>
+    <settings>
+        <setting key="standby temperature">0</setting>
+        <setting key="print cooling">100.0</setting>
+        <setting key="retraction amount">3</setting>
+        <setting key="print temperature">0</setting>
+        <setting key="heated bed temperature">0</setting>
+        <setting key="retraction speed">25</setting>
+    </settings>
+</fdmmaterial>
diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material
@@ -10,7 +10,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID>
-        <version>39</version>
+        <version>40</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>Use glue, to avoid chipping of the glass.</adhesion_info>
@@ -170,7 +170,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">

diff --git a/generic_abs_175.xml.fdm_material b/generic_abs_175.xml.fdm_material
@@ -10,8 +10,7 @@ Generic ABS 1.75mm profile. The data in this file may not be correct for your sp
             <color>Generic</color>
         </name>
         <GUID>2780b345-577b-4a24-a2c5-12e6aad3e690</GUID>
-        <version>11</version>
-        <reference_material_id>abs</reference_material_id>
+        <version>12</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>

diff --git a/generic_asa_175.xml.fdm_material b/generic_asa_175.xml.fdm_material
@@ -10,8 +10,7 @@ Generic ASA 1.75mm profile. The data in this file may not be correct for your sp
             <color>Generic</color>
         </name>
         <GUID>416eead4-0d8e-4f0b-8bfc-a91a519befa5</GUID>
-        <reference_material_id>asa</reference_material_id>
-        <version>6</version>
+        <version>7</version>
         <color_code>#ffe92a</color_code>
         <description>ASA combines the qualities of ABS with the added benefit of UV resistance and additional moisture resistance making it ideal for equipment exposed to sunlight and rain over long periods of time – such as products for the agriculture, transportation, and power and utility industries.</description>
         <adhesion_info>No glue needed</adhesion_info>

diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material
@@ -10,7 +10,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID>
-        <version>41</version>
+        <version>42</version>
         <color_code>#159499</color_code>
         <description>Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -171,7 +171,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">

diff --git a/generic_cpe_plus.xml.fdm_material b/generic_cpe_plus.xml.fdm_material
@@ -10,7 +10,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>e2409626-b5a0-4025-b73e-b58070219259</GUID>
-        <version>41</version>
+        <version>42</version>
         <color_code>#3633F2</color_code>
         <description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info>
@@ -155,7 +155,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">

diff --git a/generic_gffcpe.xml.fdm_material b/generic_gffcpe.xml.fdm_material
@@ -119,6 +119,7 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
             <setting key="print cooling">1</setting>
             <setting key="anti ooze retract position">-6</setting>
             <setting key="no load move factor">1</setting>
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>

diff --git a/generic_nylon.xml.fdm_material b/generic_nylon.xml.fdm_material
@@ -10,7 +10,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
             <color>Generic</color>
         </name>
         <GUID>28fb4162-db74-49e1-9008-d05f1e8bef5c</GUID>
-        <version>35</version>
+        <version>36</version>
         <color_code>#3DF266</color_code>
         <description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -179,7 +179,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">

diff --git a/generic_nylon_175.xml.fdm_material b/generic_nylon_175.xml.fdm_material
@@ -10,8 +10,7 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your
             <color>Generic</color>
         </name>
         <GUID>283d439a-3490-4481-920c-c51d8cdecf9c</GUID>
-        <reference_material_id>nylon</reference_material_id>
-        <version>7</version>
+        <version>8</version>
         <color_code>#3DF266</color_code>
         <description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
         <adhesion_info>Use glue.</adhesion_info>

diff --git a/generic_pc.xml.fdm_material b/generic_pc.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <color>Generic</color>
         </name>
         <GUID>98c05714-bf4e-4455-ba27-57d74fe331e4</GUID>
-        <version>38</version>
+        <version>39</version>
         <color_code>#F29030</color_code>
         <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>
@@ -163,7 +163,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">

diff --git a/generic_pc_175.xml.fdm_material b/generic_pc_175.xml.fdm_material
@@ -10,8 +10,7 @@ Generic PC 1.75mm profile. The data in this file may not be correct for your spe
             <color>Generic</color>
         </name>
         <GUID>62414577-94d1-490d-b1e4-7ef3ec40db02</GUID>
-        <reference_material_id>pc</reference_material_id>
-        <version>6</version>
+        <version>7</version>
         <color_code>#F29030</color_code>
         <description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
         <adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>

diff --git a/generic_petcf.xml.fdm_material b/generic_petcf.xml.fdm_material
@@ -58,6 +58,7 @@ Generic PET-CF profile. The data in this file may not be correct for your specif
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
+
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">no</setting>
             </hotend>

diff --git a/generic_petg.xml.fdm_material b/generic_petg.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PETG profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>1cbfaeb3-1906-4b26-b2e7-6f777a8c197a</GUID>
-        <version>27</version>
+        <version>28</version>
         <color_code>#ff5086</color_code>
         <description>Generic PETG profile. The data in this file may not be correct for your specific machine.</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -158,7 +158,7 @@ Generic PETG profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">

diff --git a/generic_petg_175.xml.fdm_material b/generic_petg_175.xml.fdm_material
@@ -10,8 +10,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s
             <color>Generic</color>
         </name>
         <GUID>69386c85-5b6c-421a-bec5-aeb1fb33f060</GUID>
-        <reference_material_id>petg</reference_material_id>
-        <version>6</version>
+        <version>7</version>
         <color_code>#f3a112</color_code>
         <description>Generic PETG profile. The data in this file may not be correct for your specific machine.</description>
         <adhesion_info>Set your prime speed to a low value (8mm/sec)</adhesion_info>

diff --git a/generic_pla_175.xml.fdm_material b/generic_pla_175.xml.fdm_material
@@ -10,8 +10,7 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp
             <color>Generic</color>
         </name>
         <GUID>0ff92885-617b-4144-a03c-9989872454bc</GUID>
-        <reference_material_id>pla</reference_material_id>
-        <version>12</version>
+        <version>13</version>
         <color_code>#ffc924</color_code>
         <description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
         <adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
@@ -138,5 +137,50 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp
             <hotend id="0.4 mm" />
         </machine>
 
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Sketch" />
+            <setting key="print temperature">220</setting>
+            <setting key="standby temperature">160</setting>
+            <setting key="print cooling">100</setting>
+            <setting key="heated bed temperature">50</setting>
+            <cura:setting key="material_bed_temperature_layer_0">55</cura:setting>
+            <cura:setting key="cool_min_temperature">215</cura:setting>
+            <cura:setting key="material_print_temperature_layer_0">225</cura:setting>
+            <cura:setting key="material_final_print_temperature">215</cura:setting>
+            <cura:setting key="material_initial_print_temperature">215</cura:setting>
+            <hotend id="0.4mm">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Sketch Large" />
+            <setting key="print temperature">210</setting>
+            <setting key="standby temperature">160</setting>
+            <setting key="print cooling">100</setting>
+            <setting key="heated bed temperature">50</setting>
+            <cura:setting key="material_bed_temperature_layer_0">55</cura:setting>
+            <cura:setting key="cool_min_temperature">210</cura:setting>
+            <cura:setting key="material_print_temperature_layer_0">220</cura:setting>
+            <cura:setting key="material_final_print_temperature">210</cura:setting>
+            <cura:setting key="material_initial_print_temperature">210</cura:setting>
+            <hotend id="0.4mm">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Sketch Sprint" />
+            <setting key="print temperature">215</setting>
+            <setting key="standby temperature">165</setting>
+            <setting key="print cooling">100</setting>
+            <setting key="heated bed temperature">55</setting>
+            <cura:setting key="material_bed_temperature_layer_0">60</cura:setting>
+            <cura:setting key="material_final_print_temperature">215</cura:setting>
+            <cura:setting key="material_initial_print_temperature">215</cura:setting>
+            <cura:setting key="cool_min_temperature">215</cura:setting>
+            <cura:setting key="material_print_temperature_layer_0">230</cura:setting>
+            <hotend id="0.4mm">
+                <setting key="hardware compatible">yes</setting>
+            </hotend>
+        </machine>
     </settings>
 </fdmmaterial>
diff --git a/generic_pp.xml.fdm_material b/generic_pp.xml.fdm_material
@@ -10,7 +10,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <color>Generic</color>
         </name>
         <GUID>aa22e9c7-421f-4745-afc2-81851694394a</GUID>
-        <version>45</version>
+        <version>46</version>
         <color_code>#85f9de</color_code>
         <description>Fatigue and chemical resistant. Polypropylene offers excellent temperature, chemical and fatigue resistance. Its toughness and low friction make it a perfect choice for prototyping and creating durable end-use models.</description>
         <adhesion_info>Adhesion sheets are required.</adhesion_info>
@@ -185,7 +185,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">no</setting>
             </hotend>
-            <hotend id="BB 0.6">
+            <hotend id="BB 0.8">
                 <setting key="hardware compatible">no</setting>
             </hotend>
             <hotend id="DD 0.4">

diff --git a/generic_pva.xml.fdm_material b/generic_pva.xml.fdm_material
@@ -10,7 +10,7 @@ Generic PVA profile. The data in this file may not be correct for your specific
             <color>Generic</color>
         </name>
         <GUID>86a89ceb-4159-47f6-ab97-e9953803d70f</GUID>
-        <version>38</version>
+        <version>40</version>
         <color_code>#a32bcc</color_code>
         <description>Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon.</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -145,11 +145,11 @@ Generic PVA profile. The data in this file may not be correct for your specific
 
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Factor 4" />
-            <setting key="print temperature">220</setting>
+            <setting key="print temperature">225</setting>
             <setting key="build volume temperature">35</setting>
             <setting key="print cooling">50</setting>
             <setting key="no load move factor">1</setting>
-            <setting key="retraction amount">5</setting>
+            <setting key="retraction amount">2.5</setting>
 
             <hotend id="BB 0.4">
                 <setting key="hardware compatible">yes</setting>