Kurt Loeffler 050bc91912 Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI. ... Cherry pick from master. Conflicts: resources/machines/ultimaker2.json resources/machines/ultimaker_original.json Contributes to issue CURA-276.		2015-12-23 12:02:42 +01:00
..
i18n	Update translations with the 15.10 versions	2015-11-17 11:55:39 +01:00
images	Tweak JobSpecs	2015-12-03 12:09:25 +01:00
machines	Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI.	2015-12-23 12:02:42 +01:00
meshes	Renaming of BQ printers meshes	2015-10-27 12:06:21 +01:00
profiles	Update default profiles with values as supplied by Paul	2015-12-04 17:12:27 +01:00
qml	Merge pull request #562 from Ultimaker/feature_ux2-1	2015-12-10 11:05:19 +01:00
settings	Merge pull request #301 from innovo3d/patch-1	2015-10-01 12:18:48 +02:00
shaders	Add SolidView plugin, which is what used to be Uranium's MeshView	2015-12-14 13:56:32 +01:00
themes/cura	Tweak Setting Category header size	2015-12-09 15:40:57 +01:00