Merge branch 'master' into PP-467-Fix-flow-sensor-margin-F4

generic_cpe.xml.fdm_material

@@ -155,6 +155,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

generic_cpe_plus.xml.fdm_material

@@ -143,6 +143,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
             <setting key="anti ooze retract position">-4</setting>
             <setting key="break preparation position">-12</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>

generic_nylon.xml.fdm_material

@@ -161,7 +161,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
             <setting key="heated bed temperature">40</setting>
             <setting key="build volume temperature">30</setting>
             <setting key="print cooling">75</setting>
-            <setting key="retraction amount">1.5</setting>
+            <setting key="retraction amount">5</setting>
             <setting key="anti ooze retract position">-6</setting>
             <setting key="no load move factor">1</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>

generic_petg.xml.fdm_material

@@ -142,6 +142,7 @@ Generic PETG profile. The data in this file may not be correct for your specific
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

generic_pp.xml.fdm_material

@@ -167,6 +167,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
             <setting key="anti ooze retract position">-14</setting>
             <setting key="break preparation position">-14</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.7</cura:setting>
             <setting key="flow sensor detection margin">0.2</setting>
 

generic_tpu.xml.fdm_material

@@ -146,7 +146,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
             <setting key="heated bed temperature">40</setting>
             <setting key="build volume temperature">30</setting>
             <setting key="print cooling">50</setting>
-            <setting key="retraction amount">2</setting>
+            <setting key="retraction amount">5</setting>
             <setting key="break position">-50</setting>
             <setting key="no load move factor">1</setting>
             <cura:setting key="material_shrinkage_percentage">100.3</cura:setting>

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>7</version>
+        <version>8</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>
@@ -55,6 +55,7 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL" />
             <setting key="build volume temperature">85</setting>
             <setting key="heated bed temperature">95</setting>
+            <cura:setting key="material_bed_temperature_layer_0">100</cura:setting>
             <hotend id="1A">
                 <setting key="hardware compatible">no</setting>
             </hotend>

ultimaker_asa_175.xml.fdm_material

@@ -8,7 +8,7 @@
         </name>
         <GUID>f79bc612-21eb-482e-ad6c-87d75bdde066</GUID>
         <reference_material_id>asa</reference_material_id>
-        <version>5</version>
+        <version>6</version>
         <color_code>#f1ece1</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>
@@ -31,8 +31,7 @@
             <machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X" />
             <setting key="print temperature">255</setting>
             <setting key="standby temperature">190</setting>
-            <setting key="build volume temperature">93</setting>
-            <setting key="heated bed temperature">95</setting>
+            <setting key="build volume temperature">107</setting>
             <cura:setting key="material_shrinkage_percentage">100.44</cura:setting>
             <cura:setting key="material_shrinkage_percentage_z">100.6</cura:setting>
 

ultimaker_cpe.xml.fdm_material

@@ -156,6 +156,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_black.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_blue.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_dark-grey.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_green.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_light-grey.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_plus.xml.fdm_material

@@ -144,6 +144,7 @@
             <setting key="anti ooze retract position">-4</setting>
             <setting key="break preparation position">-12</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_plus_black.xml.fdm_material

@@ -142,6 +142,7 @@
             <setting key="anti ooze retract position">-4</setting>
             <setting key="break preparation position">-12</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_plus_transparent.xml.fdm_material

@@ -142,6 +142,7 @@
             <setting key="anti ooze retract position">-4</setting>
             <setting key="break preparation position">-12</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_plus_white.xml.fdm_material

@@ -142,6 +142,7 @@
             <setting key="anti ooze retract position">-4</setting>
             <setting key="break preparation position">-12</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>
             <hotend id="AA 0.4">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_red.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_transparent.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_white.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_cpe_yellow.xml.fdm_material

@@ -154,6 +154,7 @@
             <setting key="anti ooze retract position">-18</setting>
             <setting key="break preparation position">-18</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
             <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_nylon.xml.fdm_material

@@ -162,7 +162,7 @@
             <setting key="heated bed temperature">40</setting>
             <setting key="build volume temperature">30</setting>
             <setting key="print cooling">75</setting>
-            <setting key="retraction amount">1.5</setting>
+            <setting key="retraction amount">5</setting>
             <setting key="anti ooze retract position">-6</setting>
             <setting key="no load move factor">1</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>

ultimaker_nylon_black.xml.fdm_material

@@ -160,7 +160,7 @@
             <setting key="heated bed temperature">40</setting>
             <setting key="build volume temperature">30</setting>
             <setting key="print cooling">75</setting>
-            <setting key="retraction amount">1.5</setting>
+            <setting key="retraction amount">5</setting>
             <setting key="anti ooze retract position">-6</setting>
             <setting key="no load move factor">1</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>

ultimaker_nylon_transparent.xml.fdm_material

@@ -160,7 +160,7 @@
             <setting key="heated bed temperature">40</setting>
             <setting key="build volume temperature">30</setting>
             <setting key="print cooling">75</setting>
-            <setting key="retraction amount">1.5</setting>
+            <setting key="retraction amount">5</setting>
             <setting key="anti ooze retract position">-6</setting>
             <setting key="no load move factor">1</setting>
             <cura:setting key="material_shrinkage_percentage">100.4</cura:setting>

ultimaker_petg.xml.fdm_material

@@ -143,6 +143,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_black.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_blue.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_blue_translucent.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_green.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_green_translucent.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_grey.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_orange.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_red.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_red_translucent.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_silver.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_transparent.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_white.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_yellow.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>

ultimaker_petg_yellow_fluorescent.xml.fdm_material

@@ -141,6 +141,7 @@
             <setting key="print cooling">50</setting>
             <setting key="heated bed temperature">85</setting>
             <setting key="no load move factor">1</setting>
+            <setting key="retraction amount">5</setting>
             <cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
            <hotend id="AA 0.25">
                 <setting key="hardware compatible">yes</setting>