7 commits

Author	SHA1	Message	Date
Jaime van Kessel	b2f37390fd	Merge branch '2.1' of https://github.com/Ultimaker/Cura	2016-02-12 09:46:23 +01:00
Ghostkeeper	29e01a698b	Match MIME types in printers with writer plugins ... The MIME types as specified in the printer definitions need to match the MIME types specified in the mesh writer plugins. Contributes to issue CURA-611.	2016-02-09 17:16:38 +01:00
Ghostkeeper	0fc17ffda0	Move file types to machine metadata ... Much better place than machine settings... Contributes to issue CURA-611.	2016-02-09 15:25:49 +01:00
Ghostkeeper	80698c47de	Add machine_file_format setting ... This will determine which file formats a machine is able to save to. The setting is currently not yet used. It will be used to filter the output formats under the Save to File dialogue. Contributes to issue CURA-611.	2016-02-09 13:50:02 +01:00
Tim Kuipers	a390aa73a8	JSON: machine_settings ==> overrides (CURA-494)	2015-12-09 14:06:33 +01:00
Tim Kuipers	8c629c511c	JSON: temp flow settings	2015-10-27 16:49:43 +01:00
Arjen Hiemstra	17d3033b9a	Move new JSON files to the right location	2015-08-25 18:11:49 +02:00

Renamed from resources/settings/maker_starter.json (Browse further)