3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge commit '8d00e28fb0'

Browse source 
# Conflicts:
#	resources/materials/generic_abs.xml.fdm_material
#	resources/materials/generic_cpe.xml.fdm_material
#	resources/materials/generic_pla.xml.fdm_material
This commit is contained in:
fieldOfView 2016-08-18 16:42:59 +02:00
commit 47fde625ba
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/materials/generic_abs.xml.fdm_material
View file

@ -10,7 +10,7 @@ Generic ABS profile. Serves as an example file, data in this file is not correct
<color>Generic</color>
</name>
<GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID>
<version>0</version>
<version>1</version>
<color_code>#8cb219</color_code>
</metadata>
<properties>

2
resources/materials/generic_cpe.xml.fdm_material
View file

@ -10,7 +10,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct
<color>Generic</color>
</name>
<GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID>
<version>0</version>
<version>1</version>
<color_code>#159499</color_code>
</metadata>
<properties>

2
resources/materials/generic_pla.xml.fdm_material
View file

@ -10,7 +10,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<color>Generic</color>
</name>
<GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID>
<version>0</version>
<version>1</version>
<color_code>#ffc924</color_code>
</metadata>
<properties>