Commit graph

6 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
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
Tim Kuipers
a390aa73a8 JSON: machine_settings ==> overrides (CURA-494) 2015-12-09 14:06:33 +01:00
Arjen Hiemstra
690bd7b861 Fix add machine pages for UMO/+ 2015-09-03 10:14:17 -07:00
Arjen Hiemstra
b9a306865e Add some data about wizard pages to ultimaker_original_plus JSON file 2015-08-25 18:13:09 +02:00
Arjen Hiemstra
1ff3a30ede Move the machine definition files to the new location 2015-08-05 20:11:37 +02:00
Renamed from resources/settings/ultimaker_original_plus.json (Browse further)