Lipu Fei 887a9d377a Use setting name "Prime Blob" ... CURA-3634		2017-05-08 10:13:59 +02:00
..
definitions	Use setting name "Prime Blob"	2017-05-08 10:13:59 +02:00
extruders	Update cartesio_extruder_3.def.json	2017-04-07 13:03:32 +02:00
i18n	Merge branch '2.5'	2017-04-13 15:02:29 +02:00
images	Make the crash dialog a bit more friendly	2016-12-08 16:15:17 +01:00
meshes	Resized Rigid3D Zero2 Platform STL	2017-04-18 22:49:50 +03:00
qml	Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu	2017-04-24 14:55:57 +02:00
quality	Merge branch '2.5'	2017-04-14 17:06:37 +02:00
shaders	WIP OpenGL 4.1 core profile. CURA-3273	2017-01-31 17:05:00 +01:00
themes/cura	Put sizes and numbers for toggle button into theme	2017-04-19 08:56:11 +02:00
variants	Merge branch '2.5'	2017-04-14 15:04:05 +02:00