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

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

Browse Source
This commit is contained in:
Tamara Hogenhout 2015-10-16 12:12:47 +02:00
commit 886083d2eb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/machines/fdmprinter.json
View File

@ -256,7 +256,6 @@
"min_value_warning": "0.2", "min_value_warning": "0.2",
"max_value_warning": "5", "max_value_warning": "5",
"type": "float", "type": "float",
"inherit_function": "parent_value",
"visible": false, "visible": false,
"children": { "children": {
"wall_line_count": { "wall_line_count": {
@ -454,7 +453,7 @@
"type": "float", "type": "float",
"default": 2, "default": 2,
"visible": false, "visible": false,
"inherit_function": "0 if parent_value == 0 else (infill_line_width * 100) / parent_value" "inherit_function": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density"
} }
} }
}, },
@ -505,7 +504,7 @@
"type": "int", "type": "int",
"default": 1, "default": 1,
"visible": false, "visible": false,
"inherit_function": "math.floor((parent_value + 0.001) / layer_height)" "inherit_function": "math.floor(( parent_value + 0.001) / layer_height)"
} }
} }
}, },