Tim Kuipers 94acf810d0 JSON fix: redo all commits (squashed) which got undone in merge ... Merge branch 'feature_firmware_travel_settings' c755479b1b overwrote fdmprinter.def.json with the feature branch version, rather than merging it with the master version. This commit is just fdmprinter.def.json as it was at 2c09fc4a67		2016-07-12 14:38:39 +02:00
..
definitions	JSON fix: redo all commits (squashed) which got undone in merge	2016-07-12 14:38:39 +02:00
i18n	Add translations for Initial Layer Z Overlap setting	2016-05-12 13:41:39 +02:00
images	Change splash-screen so it does not say "developer version", pending a release "real soon now"	2016-04-05 22:28:52 +02:00
materials	Update GUID for PLA to match the GUID in the official repository	2016-07-06 14:32:37 +02:00
meshes	Add definition for Mankati Fullscale XT+	2016-06-27 10:38:30 +02:00
qml	Emphasize settings that have a value in the user or quality profile	2016-07-11 21:15:09 +02:00
quality	Determine readonly state from location in filesystem instead of a metadata property	2016-06-09 13:16:23 +02:00
shaders	Allow setting the diffuse_color with a uniform binding	2016-06-14 11:05:50 +02:00
themes/cura	Emphasize settings that have a value in the user or quality profile	2016-07-11 21:15:09 +02:00
variants	Removed test files	2016-06-22 17:04:31 +02:00