Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

2025-07-23 22:54:01 -06:00 · 2016-03-31 10:39:28 +02:00 · 2016-03-31 10:39:28 +02:00 · effcbe5842
commit effcbe5842
parent 82eda02d37 52d064d7ab
24 changed files with 299 additions and 322 deletions
--- a/resources/machines/RigidBot.json
+++ b/resources/machines/RigidBot.json
@ -37,7 +37,6 @@

    "overrides": { 
        "layer_height": { "default": 0.2 },
-        "shell_thickness": { "default": 0.8 },
        "wall_thickness": { "default": 0.8 },
        "top_bottom_thickness": { "default": 0.3, "visible": true },
        "material_print_temperature": { "default": 195, "visible": true },
--- a/resources/machines/RigidBotBig.json
+++ b/resources/machines/RigidBotBig.json
@ -35,7 +35,6 @@

    "overrides": { 
        "layer_height": { "default": 0.2 },
-        "shell_thickness": { "default": 0.8},
        "wall_thickness": { "default": 0.8 },
        "top_bottom_thickness": { "default": 0.3, "visible": true },
        "material_print_temperature": { "default": 195, "visible": true },
--- a/resources/machines/bq_hephestos.json
+++ b/resources/machines/bq_hephestos.json
@ -40,7 +40,6 @@
    "overrides": {
        "layer_height": { "default": 0.2 },
        "layer_height_0": { "default": 0.2, "visible": false },
-        "shell_thickness": { "default": 1.0 },
        "wall_thickness": { "default": 1.0, "visible": false },
        "top_bottom_thickness": { "default": 1.0, "visible": false},
        "bottom_thickness": { "default": 1.0, "visible": false },
--- a/resources/machines/bq_hephestos_2.json
+++ b/resources/machines/bq_hephestos_2.json
@ -43,7 +43,6 @@
        "material_diameter": { "default": 1.75 },
        "layer_height": { "default": 0.2 },
        "layer_height_0": { "default": 0.2, "visible": true },
-        "shell_thickness": { "default": 1.2 },
        "wall_line_count": { "default": 3, "visible": false },
        "wall_thickness": { "default": 1.2, "visible": false },
        "top_bottom_thickness": { "default": 1.2, "visible": false },
--- a/resources/machines/bq_hephestos_xl.json
+++ b/resources/machines/bq_hephestos_xl.json
@ -40,7 +40,6 @@
    "overrides": {
        "layer_height": { "default": 0.2 },
        "layer_height_0": { "default": 0.2, "visible": false },
-        "shell_thickness": { "default": 1.0 },
        "wall_thickness": { "default": 1.0, "visible": false },
        "top_bottom_thickness": { "default": 1.0, "visible": false},
        "bottom_thickness": { "default": 1.0, "visible": false },
--- a/resources/machines/bq_witbox.json
+++ b/resources/machines/bq_witbox.json
@ -40,7 +40,6 @@
    "overrides": {
        "layer_height": { "default": 0.2 },
        "layer_height_0": { "default": 0.2, "visible": false },
-        "shell_thickness": { "default": 1.0 },
        "wall_thickness": { "default": 1.0, "visible": false },
        "top_bottom_thickness": { "default": 1.0, "visible": false},
        "bottom_thickness": { "default": 1.0, "visible": false },
--- a/resources/machines/bq_witbox_2.json
+++ b/resources/machines/bq_witbox_2.json
@ -43,7 +43,6 @@
        "material_diameter": { "default": 1.75 },
        "layer_height": { "default": 0.2 },
        "layer_height_0": { "default": 0.2, "visible": true },
-        "shell_thickness": { "default": 1.2 },
        "wall_line_count": { "default": 3, "visible": false },
        "wall_thickness": { "default": 1.2, "visible": false },
        "top_bottom_thickness": { "default": 1.2, "visible": false },
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
--- a/resources/machines/innovo-inventor.json
+++ b/resources/machines/innovo-inventor.json
@ -30,7 +30,6 @@

    "overrides": {
        "layer_height": { "default": 0.15},
-        "shell_thickness": { "default": 0.8},
        "wall_thickness": { "default": 0.8},
        "top_bottom_thickness": { "default": 0.3, "visible": true},
        "material_print_temperature": { "default": 215, "visible": true},
--- a/resources/profiles/general/Low+Quality.cfg
+++ b/resources/profiles/general/Low+Quality.cfg
@ -10,6 +10,6 @@ cool_min_layer_time = 3
 speed_wall_0 = 40
 speed_wall_x = 80
 speed_infill = 100
-shell_thickness = 1
+wall_thickness = 1
 speed_topbottom = 30

--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@ -10,7 +10,7 @@ weight = -2
 line_width = 0.22
 layer_height = 0.06
 layer_height_0 = 0.15
-shell_thickness = 0.88
+wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 retraction_amount = 6
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@ -10,7 +10,7 @@ weight = -1
 line_width = 0.35
 layer_height = 0.15
 layer_height_0 = 0.26
-shell_thickness = 0.7
+wall_thickness = 0.7
 top_bottom_thickness = 0.6
 infill_sparse_density = 18
 retraction_amount = 5.5
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@ -10,7 +10,7 @@ weight = -3
 line_width = 0.35
 layer_height = 0.06
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.84
 infill_sparse_density = 22
 retraction_amount = 5.5
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@ -9,7 +9,7 @@ weight = -2
 [settings]
 line_width = 0.35
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 retraction_amount = 5.5
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@ -10,7 +10,7 @@ weight = -4
 line_width = 0.35
 layer_height = 0.04
 layer_height_0 = 0.26
-shell_thickness = 1.4
+wall_thickness = 1.4
 top_bottom_thickness = 1.12
 infill_sparse_density = 25
 retraction_amount = 5.5
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@ -10,7 +10,7 @@ weight = -2
 line_width = 0.53
 layer_height = 0.15
 layer_height_0 = 0.4
-shell_thickness = 1.59
+wall_thickness = 1.59
 top_bottom_thickness = 1.2
 retraction_amount = 6
 speed_print = 25
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@ -10,7 +10,7 @@ weight = -2
 line_width = 0.7
 layer_height = 0.2
 layer_height_0 = 0.5
-shell_thickness = 2.1
+wall_thickness = 2.1
 top_bottom_thickness = 1.6
 infill_sparse_density = 20
 retraction_amount = 6
--- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
@ -9,7 +9,7 @@ weight = -2
 line_width = 0.22
 layer_height = 0.06
 layer_height_0 = 0.15
-shell_thickness = 0.88
+wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 infill_overlap = 0.022
--- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
@ -9,7 +9,7 @@ weight = -1
 line_width = 0.35
 layer_height = 0.15
 layer_height_0 = 0.26
-shell_thickness = 0.7
+wall_thickness = 0.7
 top_bottom_thickness = 0.6
 infill_sparse_density = 18
 infill_overlap = 0.035
--- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
@ -9,7 +9,7 @@ weight = -3
 line_width = 0.35
 layer_height = 0.06
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.84
 infill_sparse_density = 22
 infill_overlap = 0.035
--- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
@ -9,7 +9,7 @@ weight = -2
 line_width = 0.35
 layer_height = 0.1
 layer_height_0 = 0.26
-shell_thickness = 1.05
+wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_overlap = 0.035
 retraction_amount = 5.5
--- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
@ -9,7 +9,7 @@ weight = -4
 line_width = 0.35
 layer_height = 0.04
 layer_height_0 = 0.26
-shell_thickness = 1.4
+wall_thickness = 1.4
 top_bottom_thickness = 1.12
 infill_sparse_density = 25
 infill_overlap = 0.035
--- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
@ -9,7 +9,7 @@ weight = -2
 line_width = 0.53
 layer_height = 0.15
 layer_height_0 = 0.4
-shell_thickness = 1.59
+wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_overlap = 0.053
 retraction_amount = 6
--- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
@ -9,7 +9,7 @@ weight = -2
 line_width = 0.7
 layer_height = 0.2
 layer_height_0 = 0.5
-shell_thickness = 2.1
+wall_thickness = 2.1
 top_bottom_thickness = 1.6
 infill_sparse_density = 20
 infill_overlap = 0.07