Skip to content

Commit

Permalink
Merge branch 'master' into PP-514_Improve_PVA_printing_quality_and_re…
Browse files Browse the repository at this point in the history
…liability_on_Factor_4
  • Loading branch information
HellAholic authored Sep 19, 2024
2 parents 28950f9 + 856757d commit a722c04
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- '*.xml.*'
- '*.sig'
- 'conanfile.py'
- 'conandata.yml'
- '.github/workflows/conan-package.yml'
- '.github/workflows/requirements*.txt'
branches:
Expand Down
3 changes: 2 additions & 1 deletion generic_tpu.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
<color>Generic</color>
</name>
<GUID>1d52b2be-a3a2-41de-a8b1-3bcdb5618695</GUID>
<version>38</version>
<version>39</version>
<color_code>#B22744</color_code>
<description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand Down Expand Up @@ -157,6 +157,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
</hotend>
<hotend id="AA 0.8">
<setting key="hardware compatible">yes</setting>
<setting key="print cooling">100</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
Expand Down
3 changes: 2 additions & 1 deletion ultimaker_tpu.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<label>Any color TPU</label>
</name>
<GUID>bddeb098-9e1f-4d0b-be9f-e99f6f8277d8</GUID>
<version>10</version>
<version>11</version>
<color_code>#B22744</color_code>
<description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand Down Expand Up @@ -158,6 +158,7 @@
</hotend>
<hotend id="AA 0.8">
<setting key="hardware compatible">yes</setting>
<setting key="print cooling">100</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
Expand Down
3 changes: 2 additions & 1 deletion ultimaker_tpu_black.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Black</color>
</name>
<GUID>eff40bcf-588d-420d-a3bc-a5ffd8c7f4b3</GUID>
<version>42</version>
<version>43</version>
<color_code>#0e0e10</color_code>
<description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand Down Expand Up @@ -156,6 +156,7 @@
</hotend>
<hotend id="AA 0.8">
<setting key="hardware compatible">yes</setting>
<setting key="print cooling">100</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
Expand Down
3 changes: 2 additions & 1 deletion ultimaker_tpu_blue.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Blue</color>
</name>
<GUID>5f4a826c-7bfe-460f-8650-a9178b180d34</GUID>
<version>42</version>
<version>43</version>
<color_code>#00387b</color_code>
<description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand Down Expand Up @@ -156,6 +156,7 @@
</hotend>
<hotend id="AA 0.8">
<setting key="hardware compatible">yes</setting>
<setting key="print cooling">100</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
Expand Down
3 changes: 2 additions & 1 deletion ultimaker_tpu_red.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Red</color>
</name>
<GUID>07a4547f-d21f-41a0-8eee-bc92125221b3</GUID>
<version>42</version>
<version>43</version>
<color_code>#a63437</color_code>
<description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand Down Expand Up @@ -156,6 +156,7 @@
</hotend>
<hotend id="AA 0.8">
<setting key="hardware compatible">yes</setting>
<setting key="print cooling">100</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
Expand Down
3 changes: 2 additions & 1 deletion ultimaker_tpu_white.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>White</color>
</name>
<GUID>6a2573e6-c8ee-4c66-8029-3ebb3d5adc5b</GUID>
<version>42</version>
<version>43</version>
<color_code>#f1ece1</color_code>
<description>Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand Down Expand Up @@ -156,6 +156,7 @@
</hotend>
<hotend id="AA 0.8">
<setting key="hardware compatible">yes</setting>
<setting key="print cooling">100</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
Expand Down

0 comments on commit a722c04

Please sign in to comment.