diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-02-27 12:54:31 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-02-27 12:54:31 +0300 |
| commit | f6bc220faa1d7406c46fc02191bec7d01e2a525e (patch) | |
| tree | e104fdeb219710ae029b5cc4e004382763279030 /resources/definitions/skriware_2.def.json | |
| parent | 1a44aa6d2e5e4b89d9de14d4f2cc9b3e1c0f84bf (diff) | |
| parent | 05f050eccc705409b6c2b2fac822a3f2dde5b050 (diff) | |
Merge branch 'master' of https://github.com/skriDude/Cura into skriDude-master
Conflicts:
resources/definitions/skriware_2.def.json -> On master the old setting value was changed to 'value' rather than 'default_value', while on this branch the value was changed to use the resolve function.
Diffstat (limited to 'resources/definitions/skriware_2.def.json')
| -rw-r--r-- | resources/definitions/skriware_2.def.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 31c9913c8f..4ca69d6918 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -325,7 +325,7 @@ "default_value": 1.2
},
"support_infill_sparse_thickness": {
- "value": "0.2"
+ "value": "resolveOrValue('layer_height')"
},
"raft_surface_acceleration": {
"value": "250"
@@ -445,7 +445,7 @@ "default_value": 3
},
"infill_sparse_thickness": {
- "value": "0.2"
+ "value": "resolveOrValue('layer_height')"
},
"support_initial_layer_line_distance": {
"value": "1.3333333333333333"
|