3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-04 12:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
4636 commits 312 branches 275 tags 711 MiB
Commit graph

18 commits

Author SHA1 Message Date
Jaime van Kessel
6c6ced4048 Undo changes made for debugging 2016-09-02 10:10:54 +02:00
fieldOfView
7961104a0c Disable material/variant combinations we have no profile for 
CURA-2236
 2016-09-01 15:39:24 +02:00
Jaime van Kessel
cb1a36577c Machines are now flattened before merging them 
This ensures that machines are overwritten correctly

CURA-2108
 2016-09-01 11:18:15 +02:00
fieldOfView
983d0dd999 Merge commit 'dd647ca07c' 2016-08-25 10:55:31 +02:00
fieldOfView
27b3bd829d Add converted CPE+, PC, TPU & Nylon profiles for UM2+ 
CURA-2138
 2016-08-23 23:03:17 +02:00
fieldOfView
7affff53ba Merge commit 'ec04b414ec' 2016-08-18 17:48:48 +02:00
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
bdd3ecbc1a Update GUID for PLA to match the GUID in the official repository 
CURA-491
 2016-07-06 14:32:37 +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
5ce9bc64f4 Remove non-xml material profiles 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
48c8e7a189 Update generic PLA profile 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
2b91e3639e Add basic ABS and CPE material profiles 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
81d0b34f20 Update example XML material to use the right product names 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
e0c7ed8561 Add a plugin that loads XML materials and an example material 2016-05-23 02:19:39 +02:00
Jaime van Kessel
dafff9159e Added materials & qualities 
CURA-1278
 2016-05-18 11:03:44 +02:00