From be4324da5385726394bce6da3d18d10b5b3047af Mon Sep 17 00:00:00 2001 From: MariskaMaas <40423138+MariMakes@users.noreply.github.com> Date: Mon, 28 Nov 2022 14:24:29 +0100 Subject: [PATCH 1/5] Add Minimum to Adaptive Layers Maximum Variation A negative value will result in a failed slice as mentioned here https://github.com/Ultimaker/Cura/issues/13749 Warning value of 0 is added --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 54e0d60b02..7764e4c531 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7636,6 +7636,7 @@ "enabled": "adaptive_layer_height_enabled", "unit": "mm", "default_value": 0.1, + "minimum_value": "0.0", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -7647,9 +7648,9 @@ "type": "float", "enabled": "adaptive_layer_height_enabled", "default_value": 0.01, + "minimum_value": "0.001", "unit": "mm", "settable_per_mesh": false, - "minimum_value": "0.001", "settable_per_extruder": false, "settable_per_meshgroup": false }, From 3aaf2ea078f331f07b5bd17bcd78c61d16806cd3 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Mon, 28 Nov 2022 15:35:13 +0100 Subject: [PATCH 2/5] Removed Indent Tabs Aligning was weird because I used Tabs --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7764e4c531..962a375ffc 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7636,7 +7636,7 @@ "enabled": "adaptive_layer_height_enabled", "unit": "mm", "default_value": 0.1, - "minimum_value": "0.0", + "minimum_value": "0.0", "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -7648,7 +7648,7 @@ "type": "float", "enabled": "adaptive_layer_height_enabled", "default_value": 0.01, - "minimum_value": "0.001", + "minimum_value": "0.001", "unit": "mm", "settable_per_mesh": false, "settable_per_extruder": false, From 9f8e96bf1f87bac1abb2e8f2a1a17e83dabf66b8 Mon Sep 17 00:00:00 2001 From: MariskaMaas <40423138+MariMakes@users.noreply.github.com> Date: Wed, 30 Nov 2022 16:11:13 +0100 Subject: [PATCH 3/5] Resolve Merge Conflict Redid the change because of https://github.com/Ultimaker/Cura/commit/55b546cefdfea7b17536ea55f0c544a84b9149eb --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ab55238c7e..b13f413119 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -691,6 +691,7 @@ "default_value": false, "description": "Adaptive layers computes the layer heights depending on the shape of the model.", "label": "Use Adaptive Layers", + "minimum_value": "0.0", "settable_per_extruder": false, "settable_per_mesh": false, "settable_per_meshgroup": false, From 59111556d6d7809dc734d4b5f1877e27c5afe446 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Wed, 30 Nov 2022 16:15:46 +0100 Subject: [PATCH 4/5] Fix indents again Fix indents again --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index b13f413119..f0e0683c18 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -691,7 +691,7 @@ "default_value": false, "description": "Adaptive layers computes the layer heights depending on the shape of the model.", "label": "Use Adaptive Layers", - "minimum_value": "0.0", + "minimum_value": "0.0", "settable_per_extruder": false, "settable_per_mesh": false, "settable_per_meshgroup": false, @@ -8281,4 +8281,4 @@ "type": "category" } } -} \ No newline at end of file +} From b5b5ad852b2b86ad5053834a8065bf424753a582 Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 30 Nov 2022 16:33:31 +0100 Subject: [PATCH 5/5] Fix indention Contributes to CURA-9873 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index f0e0683c18..4624677043 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -691,7 +691,7 @@ "default_value": false, "description": "Adaptive layers computes the layer heights depending on the shape of the model.", "label": "Use Adaptive Layers", - "minimum_value": "0.0", + "minimum_value": "0.0", "settable_per_extruder": false, "settable_per_mesh": false, "settable_per_meshgroup": false,