Merge branch '4.0' into CURA-6004_missing_tooltips

This commit is contained in:
Diego Prado Gesto 2018-12-19 09:03:31 +01:00
commit 17cddac024
214 changed files with 2873 additions and 5497 deletions

View file

@ -60,7 +60,7 @@ Column
text: catalog.i18nc("@label:PrintjobStatus", "Unable to Slice")
source: UM.Theme.getIcon("warning")
color: UM.Theme.getColor("warning")
iconColor: UM.Theme.getColor("warning")
}
// Progress bar, only visible when the backend is in the process of slice the printjob