Jaime van Kessel 217eecccb9 Merge branch 'master' of github.com:Ultimaker/Cura		2017-06-23 09:57:34 +02:00
..
definitions	Change to use machine_nozzle_id	2017-06-22 14:00:04 +02:00
extruders	Updated helloBEEprusa printer profiles	2017-06-07 13:28:26 +01:00
i18n	Update Japanese translation	2017-06-21 11:27:25 +02:00
images	Make the crash dialog a bit more friendly	2016-12-08 16:15:17 +01:00
meshes	Updated helloBEEprusa printer profiles	2017-06-07 13:28:26 +01:00
qml	Add MaterialsModel to make material list update upon metadata change	2017-06-22 18:17:16 +02:00
quality	Merge branch 'maukcc-master'	2017-06-16 12:57:24 +02:00
shaders	Revert "Removed unneeded shader duplication."	2017-06-16 11:48:11 +02:00
themes	Merge branch 'master' of github.com:Ultimaker/Cura	2017-06-23 09:57:34 +02:00
variants	Change to use machine_nozzle_id	2017-06-22 14:00:04 +02:00