Merge branch 'master' into feature_multiextruder_machinesettings

This commit is contained in:
fieldOfView 2017-04-21 19:31:44 +02:00
commit 4d12ab1296
157 changed files with 24335 additions and 2374 deletions

View file

@ -299,7 +299,7 @@ Item
}
}
UM.I18nCatalog { id: catalog; name: "uranium"; }
UM.I18nCatalog { id: catalog; name: "cura"; }
add: Transition {
SequentialAnimation {