Tim Kuipers 4abcc8b3f1 JSON fix: magic_spiralize had child setting (CURA-3771) ... it shouldn't have a child setting because that child is not the underlying setting used by the engine. Parent settings are frontend-only settings which are merely used to let the user edit multiple leaf settings at once.		2017-05-10 16:31:53 +02:00
..
definitions	JSON fix: magic_spiralize had child setting (CURA-3771)	2017-05-10 16:31:53 +02:00
extruders	Merge branch 'maukcc-master'	2017-05-08 16:45:02 +02:00
i18n	Merge branch '2.5'	2017-04-13 15:02:29 +02:00
images	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
meshes	Convert ASCII STL files to binary STL	2017-05-10 11:55:24 +02:00
qml	Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura	2017-05-10 14:00:15 +02:00
quality	Rename TPU Normal Print to TPU Draft Print	2017-05-10 15:28:19 +02:00
shaders	WIP OpenGL 4.1 core profile. CURA-3273	2017-01-31 17:05:00 +01:00
themes/cura	A gradual infill icon untill we have a better one	2017-05-09 14:53:26 +02:00
variants	Set prime tower size by default to 20	2017-05-10 10:57:37 +02:00