GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 02:55:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/skriDude/Cura into skriDude-master

Browse Source 
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.
This commit is contained in:
Ghostkeeper 2020-02-27 10:54:31 +01:00
commit f6bc220faa
No known key found for this signature in database
GPG Key ID: 37E2020986774393
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/definitions/skriware_2.def.json
View File

@ -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"