Ghostkeeper 75a50b73c2 Move pre-heat timer into PrinterOutputDevice ... If it's held inside the device that has two advantages: It's being held per-device, so switching connection doesn't stop the timer. And also, the logic is no longer in the GUI. Contributes to issue CURA-3161.		2017-02-16 12:58:32 +01:00
..
definitions	Merge branch 'probonopd-patch-1'	2017-02-10 10:19:41 +01:00
extruders	Update cartesio_extruder_0.def.json	2017-01-31 09:01:46 +01:00
i18n	Merge branch '2.4' of github.com:Ultimaker/Cura	2017-02-10 16:43:08 +01:00
images	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
meshes	Add cartesio_platform.stl	2017-01-12 10:50:09 +01:00
qml	Move pre-heat timer into PrinterOutputDevice	2017-02-16 12:58:32 +01:00
quality	Merge branch '2.4'	2017-02-13 09:13:25 +01:00
shaders	WIP OpenGL 4.1 core profile. CURA-3273	2017-01-31 17:05:00 +01:00
themes/cura	Add material indication to extruder boxes	2017-02-03 14:52:09 +01:00
variants	Update cartesio_0.4.inst.cfg	2017-01-31 09:02:31 +01:00