12 commits

Author	SHA1	Message	Date
Tim Kuipers	24f1726585	JSOn/profiles: changed infill overlap to mm (CURA-786)	2016-03-03 17:28:45 +01:00
Jaime van Kessel	b2f37390fd	Merge branch '2.1' of https://github.com/Ultimaker/Cura	2016-02-12 09:46:23 +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	319d8197ab	fix: bq_hephestos profile syntax error	2016-01-28 15:29:20 +01:00
Tim Kuipers	8a48791a0b	Merge branch '2.1'	2016-01-28 15:25:18 +01:00
Ghostkeeper	0a07449759	Realign BQ Hephestos 2 platform ... Contributes to issue #595.	2016-01-22 10:57:15 +01:00
Tim Kuipers	a390aa73a8	JSON: machine_settings ==> overrides (CURA-494)	2015-12-09 14:06:33 +01:00
Nicanor Romero Venier	b9b798002a	Fixed indentation of JSON profiles	2015-10-27 12:51:13 +01:00
Nicanor Romero Venier	c95672ccd3	Reordered and changed settings in BQ profiles	2015-10-27 12:31:47 +01:00
Nicanor Romero Venier	bcd863d33b	Renaming of BQ printers meshes	2015-10-27 12:06:21 +01:00
Nicanor Romero Venier	ead30e71ec	Added profiles for 2nd Gen printers from BQ	2015-10-14 12:49:43 +02:00