Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3

This commit is contained in:
Jaime van Kessel 2016-09-01 15:42:29 +02:00
commit 8dc1011b67
2 changed files with 6 additions and 2 deletions

View file

@ -28,7 +28,9 @@ Generic CPE+ profile. Serves as an example file, data in this file is not correc
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Extended+"/>
<setting key="hardware compatible">yes</setting>
<hotend id="0.25 mm" />
<hotend id="0.25 mm">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="0.4 mm" />
<hotend id="0.6 mm" />
<hotend id="0.8 mm" />

View file

@ -31,7 +31,9 @@ Generic TPU 95A profile. Serves as an example file, data in this file is not cor
<hotend id="0.25 mm" />
<hotend id="0.4 mm" />
<hotend id="0.6 mm" />
<hotend id="0.8 mm" />
<hotend id="0.8 mm">
<setting key="hardware compatible">no</setting>
</hotend>
</machine>
</settings>
</fdmmaterial>