360 commits

Author	SHA1	Message	Date
Arjen Hiemstra	2d92bd660f	Set enabled property to false instead of visible for material settings in UM2	2015-09-01 15:19:20 +02:00
Arjen Hiemstra	251ce2f73d	Change active_if to enabled functions	2015-09-01 15:18:44 +02:00
Arjen Hiemstra	516c0cd516	Change all min/max/warning values in fdmprinter to functions	2015-09-01 15:18:26 +02:00
Arjen Hiemstra	5ee587a745	Options property should now be a key - value dict	2015-08-27 09:33:07 +02: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	cbd685596e	Add metadata to dual_extrusion_printer file	2015-08-25 18:12:40 +02:00
Arjen Hiemstra	17d3033b9a	Move new JSON files to the right location	2015-08-25 18:11:49 +02:00
Arjen Hiemstra	f099c30dfd	Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings ... * 'master' of github.com:ultimaker/Cura: (98 commits) 15.10 Restyling of the message stack Fixed machine head polygons Removed unused settings from fdmprinter Added action for togling fullscreen Fixed usage of wrong checkbox in viewpage Added preference to disable automatic push free Added preference to disable auto center when selecting object Cleanup 15.10 Restyling toolbar, viewmode button Update README.md Update README.md Added rudementary 3 point bed leveling 15.10 New font for Cura 15.10 Changes the styling for the open file button 15.10 Changes the label names for the different action buttons Fixed typo Endstop now stops listening upon destruction 15.10 Re-alignment of the messagestack Cleaned up code a bit Added heated bed check ...	2015-08-21 13:29:30 +02:00
Arjen Hiemstra	7101acb850	Add some metadata to fdmprinter.json since that is now required	2015-08-13 09:30:25 +02:00
Arjen Hiemstra	1ff3a30ede	Move the machine definition files to the new location	2015-08-05 20:11:37 +02:00