3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve merge conflicts

Browse source 
CURA-6483
This commit is contained in:
Lipu Fei 2019-05-02 07:45:40 +02:00
commit 71e32d94f7
30 changed files with 348 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/Models/GlobalStacksModel.py
View file

@ -73,5 +73,5 @@ class GlobalStacksModel(ListModel):
"hasRemoteConnection": has_remote_connection,
"metadata": container_stack.getMetaData().copy(),
"discoverySource": section_name})
items.sort(key = lambda i: not i["hasRemoteConnection"])
items.sort(key = lambda i: (not i["hasRemoteConnection"], i["name"]))
self.setItems(items)