ChrisTerBeke af9181287a Merge branch 'master' into qtquick-controls-2.0		2018-01-04 11:17:50 +01:00
..
definitions	Fix tevo blackwidow json file	2018-01-04 10:14:55 +01:00
extruders	Merge pull request #2814 from Ultimaker/feature_maximum_resolution	2017-11-20 18:09:11 +01:00
i18n	Corrections for Portuguese translation	2017-12-29 11:49:04 +01:00
images	Move robot to the left	2017-10-06 12:03:37 +02:00
meshes	Added 3D model for Tevo Black Widow + small fix	2017-12-31 23:15:00 +01:00
qml	Merge branch 'master' into qtquick-controls-2.0	2018-01-04 11:17:50 +01:00
quality	Added 3D model for Tevo Black Widow + small fix	2017-12-31 23:15:00 +01:00
shaders	Use material color for cutting_mesh and infill_mesh	2017-11-10 12:24:32 +01:00
themes	CURA-4525 solved merge conflicts	2018-01-03 13:52:55 +01:00
variants	CURA-4660 Fix some mismatches between quality profiles, AA0.25 variant	2017-12-01 16:45:23 +01:00