15 commits

Author	SHA1	Message	Date
Tim Kuipers	7f15505f01	Merge branch 'master' of https://github.com/Ultimaker/Cura	2015-08-24 12:05:49 +02:00
Jaime van Kessel	21ff2eaab0	Fixed machine head polygons	2015-08-20 16:14:58 +02:00
Tim Kuipers	56e4fb71ad	JSON: extruder_nr was still present in UMO and UM2	2015-08-18 16:27:35 +02:00
Tim Kuipers	91aeef18cc	JSON: removed dual settings from UMO and UM2	2015-08-18 13:08:05 +02:00
Arjen Hiemstra	f9bf27c148	Replace category stuff with the new setting overrides ... As a test for the new functionality. Also cleans up the file a little.	2015-08-17 15:07:19 +02:00
Tim Kuipers	eba71a2516	JSON: removed machine_nozzle_offset_x_1	2015-08-13 12:30:06 +02:00
Tim Kuipers	bdc1ec9047	JSON: introduced machine_heat_zone_length also in UMO and UM2	2015-08-13 10:04:00 +02:00
Tim Kuipers	0aa83c172e	bugfix: old UMs use nozzle offset in gcode, not in machine	2015-08-10 16:10:36 +02:00
Tim Kuipers	7253531002	JSON bugfix: moved extruder train setting to specific JSONs	2015-08-06 17:05:56 +02:00
Tamara Hogenhout	54f1ac7805	Adds a version, author & manufacturer to the machine settings files	2015-08-03 13:20:17 +02:00
Tamara Hogenhout	084bd25e02	Machine settings cleanup ... added manufacturers and authors to the file and changed the id's to a string more usuable in combination with other files	2015-07-31 16:41:53 +02:00
Jaime van Kessel	7c2617133e	Updated how machine selection works; Id now identifies a type of machine so multiple variations of the same machine are possible without cluttering your selection	2015-07-30 15:09:50 +02:00
Tim Kuipers	f846d3384c	bugfix? UM2 now has empty start-gcode and end-gcode	2015-07-23 10:18:19 +02:00
Arjen Hiemstra	6ef82c57b6	Do not hide the entire material category for UM2 but just the unused settings ... Fixes #55	2015-06-19 13:19:03 +02:00
Arjen Hiemstra	9f85898df7	Add cura-specific resources that were moved from Uranium	2015-05-06 18:03:45 +02:00