12 commits

Author	SHA1	Message	Date
Jaime van Kessel	a9bd73f32a	Merge branch '2.1' of https://github.com/Ultimaker/Cura	2016-03-04 10:59:40 +01:00
Tim Kuipers	24f1726585	JSOn/profiles: changed infill overlap to mm (CURA-786)	2016-03-03 17:28:45 +01:00
Tim Kuipers	884de2a8ce	JSON: fix: min_value should be a string also for third party printers :P	2016-03-03 13:09:28 +01:00
Tim Kuipers	b4b2267890	JSON: fix: rigidbot printers had duplicate id	2016-03-03 12:29:39 +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	a390aa73a8	JSON: machine_settings ==> overrides (CURA-494)	2015-12-09 14:06:33 +01:00
Tim Kuipers	8a853e5b05	JSON bugfix: infill_density ==> infill_sparse_density (CURA-550)	2015-12-08 09:48:01 +01:00
Tim Kuipers	8c629c511c	JSON: temp flow settings	2015-10-27 16:49:43 +01:00
Arjen Hiemstra	8ac5c8d52d	Move all contributed profiles to an "Other" manufacturer ... CURA-210 #done	2015-09-29 17:23:28 +02:00
Arjen Hiemstra	17d3033b9a	Move new JSON files to the right location	2015-08-25 18:11:49 +02:00

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