3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5136 commits 340 branches 299 tags 734 MiB
Commit graph

6 commits

Author SHA1 Message Date
fieldOfView
49c885923a Update machine_identifiers 2016-08-18 17:10:45 +02:00
fieldOfView
47fde625ba Merge commit '8d00e28fb0' 
# Conflicts:
#	resources/materials/generic_abs.xml.fdm_material
#	resources/materials/generic_cpe.xml.fdm_material
#	resources/materials/generic_pla.xml.fdm_material
 2016-08-18 16:42:59 +02:00
fieldOfView
2ff4e70c17 Merge changes from fdm_materials repo 2016-08-18 15:35:53 +02:00
fieldOfView
ff025a753f Change placeholder material colors 
CURA-2070
 2016-08-10 14:56:13 +02:00
fieldOfView
8e58e88511 Update GUIDs to match the GUIDs in the official repository 
CURA-491
 2016-07-04 11:50:15 +02:00
Arjen Hiemstra
2b91e3639e Add basic ABS and CPE material profiles 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00