Simon Edwards 8d146d92b3 Merge branch '2.4'		2017-01-12 13:26:25 +01:00
..
definitions	Merge pull request #1336 from fieldOfView/fix_center_zero_tower_pos	2017-01-12 10:28:53 +01:00
extruders	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
i18n	Correction of Russian translation.	2017-01-08 04:45:31 +03:00
images	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
meshes	Add definition and bed mesh for Kossel Pro	2016-12-10 00:24:32 -08:00
qml	Hide profiles selection (variant/material/quality) when hiding settings	2017-01-11 18:31:33 +01:00
quality	Make minimum fan speeds scale with parent fan speed setting	2016-12-28 10:22:35 +01:00
shaders	Tweak convex hull node and transparent object shader	2016-07-27 18:03:20 +02:00
themes/cura	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
variants	Moved some setting functions back to definitions	2016-11-25 09:39:19 +01:00