Machines are now flattened before merging them

This ensures that machines are overwritten correctly

CURA-2108
This commit is contained in:
Jaime van Kessel 2016-09-01 11:18:15 +02:00
parent ad22cf4861
commit cb1a36577c
2 changed files with 40 additions and 5 deletions

View file

@ -3,6 +3,7 @@
Automatically generated PLA profile. Data in this file may not be not correct.
-->
<fdmmaterial xmlns="http://www.ultimaker.com/material">
<inherits>generic_pla</inherits>
<metadata>
<name>
<brand>Ultimaker</brand>
@ -36,16 +37,15 @@ Automatically generated PLA profile. Data in this file may not be not correct.
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Go"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Extended"/>
<setting key="standby temperature">150</setting>
<setting key="processing temperature graph">
<point flow="2" temperature="180"/>
<point flow="10" temperature="230"/>
<point flow="2" temperature="20"/>
<point flow="10" temperature="20"/>
</setting>
</machine>
<machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker Original"/>
<setting key="standby temperature">150</setting>
<setting key="standby temperature">180</setting>
</machine>
</settings>
</fdmmaterial>