Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel

This commit is contained in:
Ian Paschal 2018-12-14 16:31:47 +01:00
commit 6747fe3550
39 changed files with 283 additions and 496 deletions

View file

@ -83,9 +83,7 @@ Item {
Column {
Repeater {
model: Cura.ExtrudersModel {
simpleNames: true;
}
model: CuraApplication.getExtrudersModel()
Label {
text: model.name;