Merge branch '2.5' of https://github.com/Ultimaker/fdm_materials into 2.5

Jack Ha · Jack Ha · commit f06d346fb343 · 2017-04-18T09:29:09.000+02:00
diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material
@@ -35,7 +35,6 @@ Generic ABS profile. The data in this file may not be correct for your specific
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -46,6 +45,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>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
                 
diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material
@@ -45,6 +45,7 @@ Generic CPE 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>
+                <setting key="heated bed temperature">80</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/generic_cpe_plus.xml.fdm_material b/generic_cpe_plus.xml.fdm_material
@@ -42,6 +42,8 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <hotend id="BB 0.4" />
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">7</setting>
+                <setting key="print cooling">1</setting>
             </hotend>
             <hotend id="BB 0.8" />
             <hotend id="AA 0.8">
diff --git a/generic_nylon.xml.fdm_material b/generic_nylon.xml.fdm_material
@@ -38,6 +38,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="retraction speed">45</setting>
             </hotend>
         </machine>
         <machine>
diff --git a/generic_pc.xml.fdm_material b/generic_pc.xml.fdm_material
@@ -41,6 +41,9 @@ Generic PC profile. The data in this file may not be correct for your specific m
             <hotend id="BB 0.4" />
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="print cooling">0</setting>
+                <setting key="retraction amount">8</setting>
+                <setting key="retraction speed">35</setting>
             </hotend>
             <hotend id="BB 0.8" />
             <hotend id="AA 0.8">
diff --git a/generic_tpu.xml.fdm_material b/generic_tpu.xml.fdm_material
@@ -42,11 +42,14 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <hotend id="BB 0.4" />
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="print cooling">20</setting>
+                <setting key="retraction speed">35</setting>
             </hotend>
             <hotend id="BB 0.8" />
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
-            </hotend>			
-        </machine>		
+                <setting key="retraction speed">45</setting>
+            </hotend>
+        </machine>
     </settings>
 </fdmmaterial>
diff --git a/ultimaker_abs_black.xml.fdm_material b/ultimaker_abs_black.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_blue.xml.fdm_material b/ultimaker_abs_blue.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_green.xml.fdm_material b/ultimaker_abs_green.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_grey.xml.fdm_material b/ultimaker_abs_grey.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_orange.xml.fdm_material b/ultimaker_abs_orange.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_pearl-gold.xml.fdm_material b/ultimaker_abs_pearl-gold.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_red.xml.fdm_material b/ultimaker_abs_red.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_silver-metallic.xml.fdm_material b/ultimaker_abs_silver-metallic.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_white.xml.fdm_material b/ultimaker_abs_white.xml.fdm_material
@@ -31,10 +31,10 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
-            <setting key="print cooling">5</setting>
             <hotend id="BB 0.4" />
             <hotend id="BB 0.8" />
             <hotend id="AA 0.25">
@@ -45,6 +45,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_abs_yellow.xml.fdm_material b/ultimaker_abs_yellow.xml.fdm_material
@@ -31,6 +31,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
@@ -45,6 +46,7 @@ Automatically generated ABS profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">90</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_cpe_black.xml.fdm_material b/ultimaker_cpe_black.xml.fdm_material
@@ -31,6 +31,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
@@ -44,6 +45,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">80</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_cpe_blue.xml.fdm_material b/ultimaker_cpe_blue.xml.fdm_material
@@ -31,6 +31,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
@@ -44,6 +45,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">80</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_cpe_dark-grey.xml.fdm_material b/ultimaker_cpe_dark-grey.xml.fdm_material
@@ -31,6 +31,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
@@ -44,6 +45,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">80</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_cpe_green.xml.fdm_material b/ultimaker_cpe_green.xml.fdm_material
@@ -31,6 +31,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
@@ -44,6 +45,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">80</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_cpe_light-grey.xml.fdm_material b/ultimaker_cpe_light-grey.xml.fdm_material
@@ -31,6 +31,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
         <machine>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3"/>
             <machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended"/>
@@ -44,6 +45,7 @@ Automatically generated CPE profile. Data in this file may not be not correct.
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="heated bed temperature">80</setting>
             </hotend>
         </machine>
     </settings>
diff --git a/ultimaker_cpe_plus_black.xml.fdm_material b/ultimaker_cpe_plus_black.xml.fdm_material
@@ -20,7 +20,7 @@ Generic CPE+ profile. Serves as an example file, data in this file is not correc
     <settings>
         <setting key="hardware compatible">no</setting><!-- This material is not supported on most printers due to high temperatures -->
         <setting key="print temperature">260</setting>
-        <setting key="heated bed temperature">110</setting>
+        <setting key="heated bed temperature">107</setting>
         <setting key="standby temperature">175</setting>
 
         <machine>
@@ -45,6 +45,8 @@ Generic CPE+ profile. Serves as an example file, data in this file is not correc
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">7</setting>
+                <setting key="print cooling">1</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
diff --git a/ultimaker_cpe_plus_transparent.xml.fdm_material b/ultimaker_cpe_plus_transparent.xml.fdm_material
@@ -20,7 +20,7 @@ Generic CPE+ profile. Serves as an example file, data in this file is not correc
     <settings>
         <setting key="hardware compatible">no</setting><!-- This material is not supported on most printers due to high temperatures -->
         <setting key="print temperature">260</setting>
-        <setting key="heated bed temperature">110</setting>
+        <setting key="heated bed temperature">107</setting>
         <setting key="standby temperature">175</setting>
 
         <machine>
@@ -45,6 +45,8 @@ Generic CPE+ profile. Serves as an example file, data in this file is not correc
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">7</setting>
+                <setting key="print cooling">1</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
diff --git a/ultimaker_cpe_plus_white.xml.fdm_material b/ultimaker_cpe_plus_white.xml.fdm_material
@@ -20,7 +20,7 @@ Generic CPE+ profile. Serves as an example file, data in this file is not correc
     <settings>
         <setting key="hardware compatible">no</setting><!-- This material is not supported on most printers due to high temperatures -->
         <setting key="print temperature">260</setting>
-        <setting key="heated bed temperature">110</setting>
+        <setting key="heated bed temperature">107</setting>
         <setting key="standby temperature">175</setting>
 
         <machine>
@@ -45,6 +45,8 @@ Generic CPE+ profile. Serves as an example file, data in this file is not correc
             </hotend>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>
+                <setting key="retraction amount">7</setting>
+                <setting key="print cooling">1</setting>
             </hotend>
             <hotend id="AA 0.8">
                 <setting key="hardware compatible">yes</setting>
diff --git a/ultimaker_nylon_black.xml.fdm_material b/ultimaker_nylon_black.xml.fdm_material
diff --git a/ultimaker_nylon_transparent.xml.fdm_material b/ultimaker_nylon_transparent.xml.fdm_material
diff --git a/ultimaker_pc_black.xml.fdm_material b/ultimaker_pc_black.xml.fdm_material
diff --git a/ultimaker_pc_transparent.xml.fdm_material b/ultimaker_pc_transparent.xml.fdm_material
diff --git a/ultimaker_pc_white.xml.fdm_material b/ultimaker_pc_white.xml.fdm_material
diff --git a/ultimaker_tpu_black.xml.fdm_material b/ultimaker_tpu_black.xml.fdm_material
diff --git a/ultimaker_tpu_blue.xml.fdm_material b/ultimaker_tpu_blue.xml.fdm_material
diff --git a/ultimaker_tpu_red.xml.fdm_material b/ultimaker_tpu_red.xml.fdm_material
diff --git a/ultimaker_tpu_white.xml.fdm_material b/ultimaker_tpu_white.xml.fdm_material
