Skip to content

Commit

Permalink
Merge pull request #318 from Ultimaker/Fix-type-in-printcore-compatib…
Browse files Browse the repository at this point in the history
…ility

Fixed type in print core compatibility BB0.6 = BB0.8
  • Loading branch information
HellAholic authored Oct 7, 2024
2 parents 1ede9a8 + f3eff94 commit 5e5ea15
Show file tree
Hide file tree
Showing 77 changed files with 162 additions and 141 deletions.
4 changes: 2 additions & 2 deletions generic_abs.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
<color>Generic</color>
</name>
<GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID>
<version>39</version>
<version>40</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>
Expand Down Expand Up @@ -170,7 +170,7 @@ Generic ABS profile. The data in this file may not be correct for your specific
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions generic_cpe.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
<color>Generic</color>
</name>
<GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID>
<version>41</version>
<version>42</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>
Expand Down Expand Up @@ -171,7 +171,7 @@ Generic CPE profile. The data in this file may not be correct for your specific
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions generic_cpe_plus.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
<color>Generic</color>
</name>
<GUID>e2409626-b5a0-4025-b73e-b58070219259</GUID>
<version>41</version>
<version>42</version>
<color_code>#3633F2</color_code>
<description>Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC.</description>
<adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints.</adhesion_info>
Expand Down Expand Up @@ -155,7 +155,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
1 change: 1 addition & 0 deletions generic_gffcpe.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P
<setting key="print cooling">1</setting>
<setting key="anti ooze retract position">-6</setting>
<setting key="no load move factor">1</setting>

<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand Down
4 changes: 2 additions & 2 deletions generic_nylon.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
<color>Generic</color>
</name>
<GUID>28fb4162-db74-49e1-9008-d05f1e8bef5c</GUID>
<version>35</version>
<version>36</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>
Expand Down Expand Up @@ -179,7 +179,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions generic_pc.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
<color>Generic</color>
</name>
<GUID>98c05714-bf4e-4455-ba27-57d74fe331e4</GUID>
<version>38</version>
<version>39</version>
<color_code>#F29030</color_code>
<description>Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness.</description>
<adhesion_info>Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding.</adhesion_info>
Expand Down Expand Up @@ -163,7 +163,7 @@ Generic PC profile. The data in this file may not be correct for your specific m
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
1 change: 1 addition & 0 deletions generic_petcf.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Generic PET-CF profile. The data in this file may not be correct for your specif

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />

<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand Down
4 changes: 2 additions & 2 deletions generic_petg.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic PETG profile. The data in this file may not be correct for your specific
<color>Generic</color>
</name>
<GUID>1cbfaeb3-1906-4b26-b2e7-6f777a8c197a</GUID>
<version>27</version>
<version>28</version>
<color_code>#ff5086</color_code>
<description>Generic PETG profile. The data in this file may not be correct for your specific machine.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand Down Expand Up @@ -158,7 +158,7 @@ Generic PETG profile. The data in this file may not be correct for your specific
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions generic_pp.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
<color>Generic</color>
</name>
<GUID>aa22e9c7-421f-4745-afc2-81851694394a</GUID>
<version>45</version>
<version>46</version>
<color_code>#85f9de</color_code>
<description>Fatigue and chemical resistant. Polypropylene offers excellent temperature, chemical and fatigue resistance. Its toughness and low friction make it a perfect choice for prototyping and creating durable end-use models.</description>
<adhesion_info>Adhesion sheets are required.</adhesion_info>
Expand Down Expand Up @@ -185,7 +185,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions generic_tough_pla.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
<color>Generic</color>
</name>
<GUID>9d5d2d7c-4e77-441c-85a0-e9eefd4aa68c</GUID>
<version>33</version>
<version>34</version>
<color_code>#ffc9f0</color_code>
<description>Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA.</description>
<adhesion_info>Print on bare glass. Use tape for cold build plates.</adhesion_info>
Expand Down Expand Up @@ -154,7 +154,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions 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>39</version>
<version>40</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 @@ -162,7 +162,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<label>Any color ABS</label>
</name>
<GUID>94209c78-8d4d-4866-8a60-5e1f7adb0c36</GUID>
<version>11</version>
<version>12</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>
Expand Down Expand Up @@ -171,7 +171,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_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>2f9d2279-9b0e-4765-bf9b-d1e1e13f3c49</GUID>
<version>43</version>
<version>44</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_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>7c9575a6-c8d6-40ec-b3dd-18d7956bfaae</GUID>
<version>43</version>
<version>44</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_green.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Green</color>
</name>
<GUID>3400c0d1-a4e3-47de-a444-7b704f287171</GUID>
<version>43</version>
<version>44</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_grey.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Gray</color>
</name>
<GUID>8b75b775-d3f2-4d0f-8fb2-2a3dd53cf673</GUID>
<version>44</version>
<version>45</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_orange.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Orange</color>
</name>
<GUID>0b4ca6ef-eac8-4b23-b3ca-5f21af00e54f</GUID>
<version>43</version>
<version>44</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_pearl-gold.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Pearl Gold</color>
</name>
<GUID>7cbdb9ca-081a-456f-a6ba-f73e4e9cb856</GUID>
<version>43</version>
<version>44</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_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>5df7afa6-48bd-4c19-b314-839fe9f08f1f</GUID>
<version>43</version>
<version>44</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_silver-metallic.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Silver</color>
</name>
<GUID>763c926e-a5f7-4ba0-927d-b4e038ea2735</GUID>
<version>44</version>
<version>45</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_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>5253a75a-27dc-4043-910f-753ae11bc417</GUID>
<version>46</version>
<version>47</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_abs_yellow.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Yellow</color>
</name>
<GUID>e873341d-d9b8-45f9-9a6f-5609e1bcff68</GUID>
<version>43</version>
<version>44</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>
Expand Down Expand Up @@ -169,7 +169,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
4 changes: 2 additions & 2 deletions ultimaker_cpe.xml.fdm_material
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<label>Any color CPE</label>
</name>
<GUID>3cf87e76-dae0-42cb-ae86-3d39918af2ad</GUID>
<version>10</version>
<version>11</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>
Expand Down Expand Up @@ -172,7 +172,7 @@
<hotend id="BB 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.6">
<hotend id="BB 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="DD 0.4">
Expand Down
Loading

0 comments on commit 5e5ea15

Please sign in to comment.