From 59be3e195dfb55f9198252a1fec162a80b08c280 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 28 Oct 2021 13:48:09 +0200 Subject: [PATCH 1/2] Use category as fallback translation for intents instead of "unkown" --- cura/Machines/Models/IntentCategoryModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 09a71b8ed6..d4f28a78e9 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -107,7 +107,7 @@ class IntentCategoryModel(ListModel): qualities = IntentModel() qualities.setIntentCategory(category) result.append({ - "name": IntentCategoryModel.translation(category, "name", catalog.i18nc("@label", "Unknown")), + "name": IntentCategoryModel.translation(category, "name", category), "description": IntentCategoryModel.translation(category, "description", None), "intent_category": category, "weight": list(IntentCategoryModel._get_translations().keys()).index(category), From 61c43fb765d74997922789d8bd2c3558f212cd9e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 28 Oct 2021 13:53:52 +0200 Subject: [PATCH 2/2] Only show "can't find location message" when it couldn't find location Bit of a silly mistake, but easy enough to fix! CURA-8649 --- cura/Arranging/Nest2DArrange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py index ebe96202f2..c29a0648df 100644 --- a/cura/Arranging/Nest2DArrange.py +++ b/cura/Arranging/Nest2DArrange.py @@ -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.push() - return not_fit_count != 0 + return not_fit_count == 0