Skip to content

Commit

Permalink
Merge pull request #284 from Ultimaker/5.7
Browse files Browse the repository at this point in the history
5.7
  • Loading branch information
rburema committed Apr 2, 2024
2 parents 97219c0 + 8a4eeff commit 0c3cd75
Show file tree
Hide file tree
Showing 82 changed files with 165 additions and 159 deletions.
2 changes: 1 addition & 1 deletion conandata.yml
@@ -1 +1 @@
version: "5.7.0-alpha.0"
version: "5.7.0-beta.1"
4 changes: 2 additions & 2 deletions ultimaker_abs.xml.fdm_material
Expand Up @@ -8,11 +8,11 @@
<label>Any color ABS</label>
</name>
<GUID>94209c78-8d4d-4866-8a60-5e1f7adb0c36</GUID>
<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>Use glue, to avoid chipping of the glass.</adhesion_info>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
<abstract_color>true</abstract_color>
</metadata>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_black.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Black</color>
</name>
<GUID>2f9d2279-9b0e-4765-bf9b-d1e1e13f3c49</GUID>
<version>39</version>
<version>40</version>
<color_code>#2a292a</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_blue.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Blue</color>
</name>
<GUID>7c9575a6-c8d6-40ec-b3dd-18d7956bfaae</GUID>
<version>39</version>
<version>40</version>
<color_code>#00387b</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_green.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Green</color>
</name>
<GUID>3400c0d1-a4e3-47de-a444-7b704f287171</GUID>
<version>39</version>
<version>40</version>
<color_code>#61993b</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_grey.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Gray</color>
</name>
<GUID>8b75b775-d3f2-4d0f-8fb2-2a3dd53cf673</GUID>
<version>40</version>
<version>41</version>
<color_code>#52595d</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_orange.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Orange</color>
</name>
<GUID>0b4ca6ef-eac8-4b23-b3ca-5f21af00e54f</GUID>
<version>39</version>
<version>40</version>
<color_code>#ed6b21</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_pearl-gold.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Pearl Gold</color>
</name>
<GUID>7cbdb9ca-081a-456f-a6ba-f73e4e9cb856</GUID>
<version>39</version>
<version>40</version>
<color_code>#80643f</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_red.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Red</color>
</name>
<GUID>5df7afa6-48bd-4c19-b314-839fe9f08f1f</GUID>
<version>39</version>
<version>40</version>
<color_code>#bb1e10</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_silver-metallic.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Silver</color>
</name>
<GUID>763c926e-a5f7-4ba0-927d-b4e038ea2735</GUID>
<version>40</version>
<version>41</version>
<color_code>#a1a1a0</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_white.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>White</color>
</name>
<GUID>5253a75a-27dc-4043-910f-753ae11bc417</GUID>
<version>42</version>
<version>43</version>
<color_code>#ecece7</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_yellow.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Yellow</color>
</name>
<GUID>e873341d-d9b8-45f9-9a6f-5609e1bcff68</GUID>
<version>39</version>
<version>40</version>
<color_code>#f7b500</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-abs/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602935</instruction_link>
</metadata>
<properties>
<density>1.1</density>
Expand Down
3 changes: 2 additions & 1 deletion ultimaker_abscf_175.xml.fdm_material
Expand Up @@ -8,10 +8,11 @@
</name>
<GUID>495a0ce5-9daf-4a16-b7b2-06856d82394d</GUID>
<reference_material_id>abs-cf10</reference_material_id>
<version>5</version>
<version>6</version>
<color_code>#0e0e10</color_code>
<description>The performance of carbon fiber with the reliability of ABS</description>
<adhesion_info>No glue needed</adhesion_info>
<instruction_link>https://support.ultimaker.com/s/article/How-to-print-with-Method-ABS-CF</instruction_link>
</metadata>
<properties>
<density>1.05</density>
Expand Down
3 changes: 2 additions & 1 deletion ultimaker_absr_175.xml.fdm_material
Expand Up @@ -8,10 +8,11 @@
</name>
<GUID>88c8919c-6a09-471a-b7b6-e801263d862d</GUID>
<reference_material_id>abs-wss1</reference_material_id>
<version>5</version>
<version>7</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>
<instruction_link>https://support.ultimaker.com/s/article/How-to-print-with-Method-ABS-R</instruction_link>
</metadata>
<properties>
<density>1.05</density>
Expand Down
5 changes: 3 additions & 2 deletions ultimaker_asa_175.xml.fdm_material
Expand Up @@ -8,10 +8,11 @@
</name>
<GUID>f79bc612-21eb-482e-ad6c-87d75bdde066</GUID>
<reference_material_id>asa</reference_material_id>
<version>2</version>
<color_code>#8cb219</color_code>
<version>4</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>
<instruction_link>https://support.ultimaker.com/s/article/How-to-print-with-Method-ASA</instruction_link>
</metadata>
<properties>
<density>1.07</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_bam.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>White</color>
</name>
<GUID>7e6207c4-22ff-441a-b261-ff89f166d5f9</GUID>
<version>36</version>
<version>37</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-breakaway/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337600384</instruction_link>
</metadata>
<properties>
<density>1.22</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe.xml.fdm_material
Expand Up @@ -8,11 +8,11 @@
<label>Any color CPE</label>
</name>
<GUID>3cf87e76-dae0-42cb-ae86-3d39918af2ad</GUID>
<version>6</version>
<version>7</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
<abstract_color>true</abstract_color>
</metadata>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_black.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Black</color>
</name>
<GUID>a8955dc3-9d7e-404d-8c03-0fd6fee7f22d</GUID>
<version>41</version>
<version>42</version>
<color_code>#2a292a</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_blue.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Blue</color>
</name>
<GUID>4d816290-ce2e-40e0-8dc8-3f702243131e</GUID>
<version>41</version>
<version>42</version>
<color_code>#00a3e0</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_dark-grey.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Dark Gray</color>
</name>
<GUID>10961c00-3caf-48e9-a598-fa805ada1e8d</GUID>
<version>42</version>
<version>43</version>
<color_code>#4f5250</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_green.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Green</color>
</name>
<GUID>7ff6d2c8-d626-48cd-8012-7725fa537cc9</GUID>
<version>41</version>
<version>42</version>
<color_code>#78be20</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_light-grey.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Light Gray</color>
</name>
<GUID>173a7bae-5e14-470e-817e-08609c61e12b</GUID>
<version>42</version>
<version>43</version>
<color_code>#c5c7c4</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_red.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Red</color>
</name>
<GUID>00181d6c-7024-479a-8eb7-8a2e38a2619a</GUID>
<version>41</version>
<version>42</version>
<color_code>#c8102e</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_transparent.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Transparent</color>
</name>
<GUID>bd0d9eb3-a920-4632-84e8-dcd6086746c5</GUID>
<version>41</version>
<version>42</version>
<color_code>#d0d0d0</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_white.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>White</color>
</name>
<GUID>881c888e-24fb-4a64-a4ac-d5c95b096cd7</GUID>
<version>41</version>
<version>42</version>
<color_code>#f1ece1</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe_yellow.xml.fdm_material
Expand Up @@ -7,11 +7,11 @@
<color>Yellow</color>
</name>
<GUID>b9176a2a-7a0f-4821-9f29-76d882a88682</GUID>
<version>41</version>
<version>42</version>
<color_code>#f6b600</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-cpe/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602543</instruction_link>
</metadata>
<properties>
<density>1.27</density>
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_nylon.xml.fdm_material
Expand Up @@ -8,11 +8,11 @@
<label>Any color Nylon</label>
</name>
<GUID>c6714ed4-9734-4266-b4e1-d90b8b0c2434</GUID>
<version>6</version>
<version>7</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>
<instruction_link>https://ultimaker.com/in/cura/materials/ultimaker-nylon/printing-guidelines</instruction_link>
<instruction_link>https://support.ultimaker.com/s/article/1667337602768</instruction_link>
<abstract_color>true</abstract_color>
</metadata>
<properties>
Expand Down
5 changes: 3 additions & 2 deletions ultimaker_nylon12-cf_175.xml.fdm_material
Expand Up @@ -8,10 +8,11 @@
</name>
<GUID>3c6f2877-71cc-4760-84e6-4b89ab243e3b</GUID>
<reference_material_id>nylon12-cf</reference_material_id>
<version>2</version>
<color_code>#8cb219</color_code>
<version>4</version>
<color_code>#0e0e10</color_code>
<description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
<adhesion_info>Use glue.</adhesion_info>
<instruction_link>https://support.ultimaker.com/s/article/How-to-print-with-Method-Nylon12-CF</instruction_link>
</metadata>
<properties>
<density>1.14</density>
Expand Down

0 comments on commit 0c3cd75

Please sign in to comment.