GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 01:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.12' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2021-10-28 13:54:58 +02:00
commit 42e066a5a8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Arranging/Nest2DArrange.py
View File

@ -159,4 +159,4 @@ def arrange(nodes_to_arrange: List["SceneNode"],
grouped_operation, not_fit_count = createGroupOperationForArrange(nodes_to_arrange, build_volume, fixed_nodes, factor, add_new_nodes_in_scene) grouped_operation, not_fit_count = createGroupOperationForArrange(nodes_to_arrange, build_volume, fixed_nodes, factor, add_new_nodes_in_scene)
grouped_operation.push() grouped_operation.push()
return not_fit_count != 0 return not_fit_count == 0

2
cura/Machines/Models/IntentCategoryModel.py
View File

@ -107,7 +107,7 @@ class IntentCategoryModel(ListModel):
qualities = IntentModel() qualities = IntentModel()
qualities.setIntentCategory(category) qualities.setIntentCategory(category)
result.append({ result.append({
"name": IntentCategoryModel.translation(category, "name", catalog.i18nc("@label", "Unknown")), "name": IntentCategoryModel.translation(category, "name", category),
"description": IntentCategoryModel.translation(category, "description", None), "description": IntentCategoryModel.translation(category, "description", None),
"intent_category": category, "intent_category": category,
"weight": list(IntentCategoryModel._get_translations().keys()).index(category), "weight": list(IntentCategoryModel._get_translations().keys()).index(category),