Merge branch 'fieldOfView-fix_1_75_materials'

Ultimaker · May 17, 2017 · 4fdffb9 · 4fdffb9
2 parents 2d21c38 + 84b9223
commit 4fdffb9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/chromatik_pla.xml.fdm_material b/chromatik_pla.xml.fdm_material
@@ -8,6 +8,7 @@
         </name>
         <GUID>69fd1f24-f411-470e-8158-9e5552f36147</GUID>
         <version>1</version>
+        <color_code>#ffc924</color_code>
     </metadata>
     <properties>
         <density>1.24</density>

diff --git a/polyflex_pla.xml.fdm_material b/polyflex_pla.xml.fdm_material
@@ -2,7 +2,8 @@
 <fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
     <metadata>
         <name>
-            <brand>PolyFlex</brand>
+            <brand>Polymaker</brand>
+            <label>PolyFlex</label>
             <material>PLA</material>
             <color>Generic</color>
         </name>

diff --git a/polymax_pla.xml.fdm_material b/polymax_pla.xml.fdm_material
@@ -2,7 +2,8 @@
 <fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
     <metadata>
         <name>
-            <brand>PolyMax</brand>
+            <brand>Polymaker</brand>
+            <label>PolyMax</label>
             <material>PLA</material>
             <color>Generic</color>
         </name>

diff --git a/polyplus_pla.xml.fdm_material b/polyplus_pla.xml.fdm_material
@@ -2,7 +2,8 @@
 <fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
     <metadata>
         <name>
-            <brand>PolyPlus</brand>
+            <brand>Polymaker</brand>
+            <label>PolyPlus</label>
             <material>PLA</material>
             <color>Generic</color>
         </name>

diff --git a/polywood_pla.xml.fdm_material b/polywood_pla.xml.fdm_material
@@ -2,7 +2,8 @@
 <fdmmaterial xmlns="http://www.ultimaker.com/material" version="1.3">
     <metadata>
         <name>
-            <brand>PolyWood</brand>
+            <brand>Polymaker</brand>
+            <label>PolyWood</label>
             <material>PLA</material>
             <color>Generic</color>
         </name>