Merge branch 'master' into master

.github/workflows/conan-package.yml

@@ -19,7 +19,7 @@ on:
             - main
             - master
             - 'CURA-*'
-            - '[0-9]+.[0-9]+'
+            - '[0-9].[0-9]*'
         tags:
             - '[1-9]+.[0-9]+.[0-9]*'
             - '[1-9]+.[0-9]+.[0-9]'

conanfile.py

@@ -1,10 +1,11 @@
 import os
 
 from conan import ConanFile
-from conans import tools
+from conan.tools.files import copy
+from conan.tools.scm import Version
 from conan.errors import ConanInvalidConfiguration
 
-required_conan_version = ">=1.47.0"
+required_conan_version = ">=1.56.0"
 
 
 class FDM_MaterialsConan(ConanFile):
@@ -18,26 +19,26 @@ class FDM_MaterialsConan(ConanFile):
     exports = "LICENSE*"
     settings = "os", "compiler", "build_type", "arch"
     no_copy_source = True
-    scm = {
-        "type": "git",
-        "subfolder": ".",
-        "url": "auto",
-        "revision": "auto"
-    }
+
+    def set_version(self):
+        if not self.version:
+            self.version = "5.4.0-beta.1"
+
+    def export_sources(self):
+        copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder)
+        copy(self, "*.sig", self.recipe_folder, self.export_sources_folder)
 
     def validate(self):
-        if tools.Version(self.version) <= tools.Version("4"):
+        if Version(self.version) <= Version("4"):
             raise ConanInvalidConfiguration("Only versions 5+ are support")
 
-    def layout(self):
-        self.cpp.package.resdirs = ["materials"]
-
     def package(self):
-        self.copy("*.fdm_material", src = ".", dst = self.cpp.package.resdirs[0])
-        self.copy("*.sig", src = ".", dst = self.cpp.package.resdirs[0])
+        copy(self, "*.fdm_material", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
+        copy(self, "*.sig", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
+
+    def package_info(self):
+        self.cpp_info.includedirs = []
+        self.cpp_info.resdirs = ["res"]
 
     def package_id(self):
-        del self.info.settings.os
-        del self.info.settings.compiler
-        del self.info.settings.build_type
-        del self.info.settings.arch
+        self.info.clear()

eSUN_PLA_PRO_Black.xml.fdm_material

@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Black</color>
+            <label>PLA+ Black</label>
         </name>
         <color_code>#333333</color_code>
         <GUID>5c4e29a1-0722-4cfa-b147-338924afc075</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

eSUN_PLA_PRO_Grey.xml.fdm_material

@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Grey</color>
+            <label>PLA+ Grey</label>
         </name>
         <color_code>#999999</color_code>
         <GUID>061cc7c6-77b1-4d76-996f-d049546b41d2</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

eSUN_PLA_PRO_Purple.xml.fdm_material

@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Purple</color>
+            <label>PLA+ Purple</label>
         </name>
         <color_code>#9900CC</color_code>
         <GUID>ae0c8895-b4b3-4a12-a5a5-3ae754940ced</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

eSUN_PLA_PRO_White.xml.fdm_material

@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>White</color>
+            <label>PLA+ White</label>
         </name>
         <color_code>#EEEEEE</color_code>
         <GUID>832e163d-db99-4a58-80b9-f82073ae0a9b</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

generic_abs.xml.fdm_material

@@ -10,13 +10,13 @@ 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>30</version>
+        <version>35</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>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>2.85</diameter>
     </properties>
     <settings>
@@ -40,22 +40,29 @@ Generic ABS profile. The data in this file may not be correct for your specific
         <setting key="no load move factor">0.92</setting>
 
         <!-- print settings -->
-        <setting key="print temperature">230</setting>
-        <setting key="standby temperature">130</setting>
+        <setting key="print temperature">245</setting>
+        <setting key="standby temperature">145</setting>
         <setting key="heated bed temperature">80</setting>
         <setting key="build volume temperature">36</setting>
         <setting key="adhesion tendency">0</setting>
         <setting key="surface energy">70</setting>
+        <cura:setting key="cool_fan_speed_max">15</cura:setting>
         <cura:setting key="material_shrinkage_percentage">100</cura:setting>
 
         <!-- For material flow sensor -->
         <setting key="relative extrusion">1.0</setting>
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <machine>
+            <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Original"/>
+            <setting key="print temperature">230</setting>
+        </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2+"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 2 Extended+"/>
+            <setting key="print temperature">230</setting>
 
             <hotend id="0.25 mm" />
             <hotend id="0.4 mm" />
@@ -68,7 +75,6 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">225</setting>
                 <setting key="print cooling">40</setting>
                 <setting key="retraction amount">6.5</setting>
             </hotend>
@@ -79,6 +85,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
                 <setting key="heated bed temperature">90</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -97,6 +104,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="0.8 mm">
                 <setting key="print temperature">260</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -105,7 +113,6 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <setting key="heated bed temperature">85</setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">225</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -114,6 +121,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 
@@ -123,7 +131,6 @@ Generic ABS profile. The data in this file may not be correct for your specific
             <setting key="heated bed temperature">85</setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>
-                <setting key="print temperature">225</setting>
                 <setting key="print cooling">40</setting>
             </hotend>
             <hotend id="AA 0.4">
@@ -132,6 +139,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">10</cura:setting>
             </hotend>
         </machine>
 

generic_abs_175.xml.fdm_material

@@ -2,20 +2,21 @@
 <!--
 Generic ABS 1.75mm profile. The data in this file may not be correct for your specific machine.
 -->
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Generic</brand>
             <material>ABS</material>
             <color>Generic</color>
         </name>
         <GUID>2780b345-577b-4a24-a2c5-12e6aad3e690</GUID>
-        <version>8</version>
+        <version>11</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>
     </metadata>
     <properties>
-        <density>1.10</density>
+        <density>1.1</density>
         <diameter>1.75</diameter>
     </properties>
     <settings>

generic_asa_175.xml.fdm_material

@@ -2,17 +2,18 @@
 <!--
 Generic ASA 1.75mm profile. The data in this file may not be correct for your specific machine.
 -->
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Generic</brand>
             <material>ASA</material>
             <color>Generic</color>
         </name>
         <GUID>416eead4-0d8e-4f0b-8bfc-a91a519befa5</GUID>
-        <version>2</version>
+        <version>5</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>
     </metadata>
     <properties>
         <density>1.07</density>

generic_bam.xml.fdm_material

@@ -2,15 +2,15 @@
 <!--
 Generic break away support material profile. The data in this file may not be correct for your specific machine.
 -->
-<fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
+<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
     <metadata>
         <name>
             <brand>Generic</brand>
             <material>Breakaway</material>
             <color>Generic</color>
         </name>
         <GUID>7e6207c4-22ff-441a-b261-ff89f166d6a0</GUID>
-        <version>30</version>
+        <version>32</version>
         <color_code>#F1ECE1</color_code>
         <description>Breakaway Material. Breakaway is a matching support material for PLA, ABS, CPE, CPE+, and Nylon</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -51,12 +51,16 @@ Generic break away support material profile. The data in this file may not be co
         <setting key="flow sensor detection margin">0.8</setting>
         <setting key="retract compensation">0</setting>
 
+        <!-- Define as unsoluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
             <setting key="print cooling">100</setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
         </machine>
 
@@ -65,6 +69,7 @@ Generic break away support material profile. The data in this file may not be co
             <setting key="print cooling">100</setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
         </machine>
 
@@ -75,6 +80,7 @@ Generic break away support material profile. The data in this file may not be co
             <setting key="print cooling">100</setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <cura:setting key="cool_min_layer_time">3</cura:setting>
             </hotend>
         </machine>
 

generic_bvoh_175.xml.fdm_material

@@ -10,7 +10,7 @@ Generic BVOH 1.75mm profile. The data in this file may not be correct for your s
             <color>Generic</color>
         </name>
         <GUID>923e604c-8432-4b09-96aa-9bbbd42207f4</GUID>
-        <version>1</version>
+        <version>2</version>
         <color_code>#ffaaff</color_code>
         <description>This is the baseline profile for the Water soluble support material BVOH. BVOH is a matching support material for PLA, ABS, ASA, PET-G, Nylon, TPU.</description>
         <adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
@@ -20,6 +20,10 @@ Generic BVOH 1.75mm profile. The data in this file may not be correct for your s
         <diameter>1.75</diameter>
     </properties>
     <settings>
+
+        <!-- Define as soluble support material -->
+        <cura:setting key="material_is_support_material">true</cura:setting>
+
         <setting key="print temperature">205</setting>
         <setting key="standby temperature">150</setting>
         <setting key="heated bed temperature">60</setting>

generic_cffcpe.xml.fdm_material

@@ -10,7 +10,7 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
             <color>Generic</color>
         </name>
         <GUID>f8e496d6-7599-4015-9fac-c7ce53f6633c</GUID>
-        <version>20</version>
+        <version>21</version>
         <color_code>#212F3D</color_code>
         <description>This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print Profile Assistant. This profile can also be used for other base materials (ABS, PP, etc)</description>
         <adhesion_info>Use glue.</adhesion_info>
@@ -20,6 +20,7 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
         <diameter>2.85</diameter>
     </properties>
     <settings>
+        <!-- Deprime settings -->
         <setting key="anti ooze retract position">-8</setting>
         <setting key="anti ooze retract speed">25</setting>
         <setting key="break preparation position">0</setting>
@@ -28,6 +29,8 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print
         <setting key="break position">-50</setting>
         <setting key="break speed">25</setting>
         <setting key="break temperature">145</setting>
+
+        <!-- material station (un)loading settings -->
         <setting key="maximum park duration">7200</setting>
         <setting key="no load move factor">0.94</setting>
         <setting key="flush purge speed">0.5</setting>