mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 05:23:58 -06:00
Merge branch 'master' into feature_multiextruder_machinesettings
This commit is contained in:
commit
4d12ab1296
157 changed files with 24335 additions and 2374 deletions
|
@ -299,7 +299,7 @@ Item
|
|||
}
|
||||
}
|
||||
|
||||
UM.I18nCatalog { id: catalog; name: "uranium"; }
|
||||
UM.I18nCatalog { id: catalog; name: "cura"; }
|
||||
|
||||
add: Transition {
|
||||
SequentialAnimation {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue