Tim Kuipers 69fab0489d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1		2016-03-23 18:43:28 +01:00
..
i18n	Update translation templates	2016-03-23 16:45:41 +01:00
images	Update UM2+, UM2Ex and UM2Ex+ backplates	2016-03-03 16:19:24 +01:00
machines	JSON fix: removed inherit cause it already had an inherit_function (CURA-1195)	2016-03-23 18:19:50 +01:00
meshes	Rename inventor_platform.stl to match the rest	2016-03-03 17:21:00 +01:00
profiles	profiles: got print speed from old cura (CURA-1195)	2016-03-23 18:26:03 +01:00
qml	Added extra relative move to prevent nozzle scraping	2016-03-17 14:57:44 +01:00
shaders	Add SolidView plugin, which is what used to be Uranium's MeshView	2015-12-14 13:56:32 +01:00
themes/cura	Add a notice icon	2016-03-15 17:56:30 +01:00