From 3228766dd52337abc6c53250d9783dcd473462e8 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 5 Aug 2020 14:12:00 +0200 Subject: [PATCH 1/2] Fix "Fetching Packages" text in the Marketplace in dark mode CURA-7627 --- plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml b/plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml index 025239bd43..a30af6b335 100644 --- a/plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml +++ b/plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml @@ -4,6 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 +import UM 1.3 as UM Rectangle { @@ -14,6 +15,7 @@ Rectangle Label { text: catalog.i18nc("@info", "Fetching packages...") + color: UM.Theme.getColor("text") anchors { centerIn: parent From 711e930fa0e209cbad3f9f09090ceb188d4b53f0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 5 Aug 2020 14:54:49 +0200 Subject: [PATCH 2/2] Enable support brim by default for tree support This was decided on by the material & process engineers. It's a pretty safe change since the support brim pretty much has only advantages if there is no support infill. Fixes ST-3552. --- resources/definitions/erzay3d.def.json | 2 +- resources/definitions/fdmprinter.def.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 1fe777091f..9258a22f0c 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -70,7 +70,7 @@ "jerk_print": { "default_value": 10 }, "support_angle": { "default_value": 65 }, - "support_brim_enable": { "default_value": true }, + "support_brim_enable": { "value": true }, "adhesion_type": { "default_value": "skirt" }, "brim_outside_only": { "default_value": false }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ca9045126b..2623dff181 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4413,6 +4413,7 @@ "description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.", "type": "bool", "default_value": false, + "value": "support_structure == 'tree'", "enabled": "support_enable or support_meshes_present", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false,