Merge branch '3.3'

This commit is contained in:
Ghostkeeper 2018-04-24 10:49:30 +02:00
commit db0288fec4
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
5 changed files with 147 additions and 130 deletions

View file

@ -225,7 +225,8 @@ UM.MainWindow
onObjectRemoved: settingsMenu.removeItem(object)
}
BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: Cura.MachineManager.hasVariantBuildplates }
// TODO Temporary hidden, add back again when feature ready
// BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: Cura.MachineManager.hasVariantBuildplates }
ProfileMenu { title: catalog.i18nc("@title:menu", "&Profile"); }
MenuSeparator { }