Ghostkeeper b69f337ddb Set machine_extruder_count in sync with defined extruders ... The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine. Contributes to issue CURA-3497.		2017-05-03 17:01:08 +02:00
..
definitions	Set machine_extruder_count in sync with defined extruders	2017-05-03 17:01:08 +02:00
extruders	Merge branch 'master' into feature_multiextruder_machinesettings	2017-04-21 19:31:44 +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	Resized Rigid3D Zero2 Platform STL	2017-04-18 22:49:50 +03:00
qml	Merge branch 'master' into cura_containerstack	2017-05-03 15:21:01 +02:00
quality	Merge branch 'feature_support_top_bottom_speed'	2017-04-25 16:46:30 +02:00
shaders	WIP OpenGL 4.1 core profile. CURA-3273	2017-01-31 17:05:00 +01:00
themes/cura	Slightly reduce minimum window size	2017-05-02 13:39:12 +02:00
variants	Merge branch '2.5'	2017-04-14 15:04:05 +02:00