Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jack Ha 2016-10-06 15:23:14 +02:00
commit ab23637f3b
37 changed files with 89 additions and 72 deletions

View file

@ -161,10 +161,6 @@ Rectangle
visible: showProgress;
indeterminate:
{
if(!showProgress)
{
return false; //Never be indeterminate when not visible, since that triggers a redraw of the screen.
}
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
{
case "pausing":