Merge branch '3.2'

This commit is contained in:
Ghostkeeper 2018-01-15 16:52:28 +01:00
commit e7c5120f9c
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
4 changed files with 11 additions and 13 deletions

View file

@ -63,9 +63,9 @@ Item
menu: ProfileMenu { }
function generateActiveQualityText () {
result = Cura.MachineManager.activeQualityName
var result = Cura.MachineManager.activeQualityName;
if (Cura.MachineManager.isActiveQualitySupported ) {
if (Cura.MachineManager.isActiveQualitySupported) {
if (Cura.MachineManager.activeQualityLayerHeight > 0) {
result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
result += " - "