6 commits

Author	SHA1	Message	Date
Ghostkeeper	7a217130a7	Fix profiles and FDMprinter after merge ... Merge didn't go too well. Contributes to issue CURA-1235.	2016-04-05 09:49:44 +02:00
fieldOfView	48a181d0b5	Add weights to standard profiles for sorting ... Contributes to CURA-1059	2016-03-08 17:45:00 +01:00
Tim Kuipers	24f1726585	JSOn/profiles: changed infill overlap to mm (CURA-786)	2016-03-03 17:28:45 +01:00
fieldOfView	277dd71759	Align variant naming in profiles and machine definitions	2016-02-08 09:18:33 +01:00
fieldOfView	bfa45245cc	machine_type is a reference to the id, not the name	2016-02-08 09:18:33 +01:00
fieldOfView	747f5fbd55	Add converted UM2+ profiles (variant/material specific)	2016-02-08 09:18:32 +01:00