Ghostkeeper 0684cee681 Merge branch '2.1' ... Conflicts: resources/machines/fdmprinter.json resources/machines/innovo-inventor.json resources/profiles/general/High+Quality.cfg resources/profiles/general/Low+Quality.cfg resources/profiles/general/Normal+Quality.cfg resources/profiles/general/Ulti+Quality.cfg resources/profiles/ultimaker2+/pla_0.4_high.curaprofile		2016-04-04 18:49:09 +02:00
..
i18n	Update template files	2016-04-01 16:46:06 +02:00
images	Update UM2+, UM2Ex and UM2Ex+ backplates	2016-03-03 16:19:24 +01:00
machines	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
meshes	Rename inventor_platform.stl to match the rest	2016-03-03 17:21:00 +01:00
profiles	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
qml	Prevent bindingloop warning	2016-04-04 12:08:46 +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	Merge branch '2.1'	2016-04-04 18:49:09 +02:00