3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

Merge branch '2.1'

Browse source
This commit is contained in:
Tim Kuipers 2016-01-28 15:25:18 +01:00
commit 8a48791a0b
83 changed files with 14784 additions and 9510 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/machines/dual_extrusion_printer.json
View file

@ -153,6 +153,8 @@
"type": "float",
"unit": "mm",
"default": 200,
"min_value_warning": "-1000",
"max_value_warning": "1000",
"enabled": "prime_tower_enable"
},
"prime_tower_position_y": {
@ -162,6 +164,8 @@
"type": "float",
"unit": "mm",
"default": 200,
"min_value_warning": "-1000",
"max_value_warning": "1000",
"enabled": "prime_tower_enable"
},
"prime_tower_flow": {
@ -231,6 +235,8 @@
"unit": "mm",
"type": "float",
"default": 16,
"min_value_warning": "0",
"max_value_warning": "100",
"visible": false,
"inherit_function": "machine_heat_zone_length",
"enabled": "retraction_enable"
@ -241,6 +247,8 @@
"unit": "mm/s",
"type": "float",
"default": 20,
"min_value": "0.1",
"max_value_warning": "300",
"visible": false,
"inherit": false,
"enabled": "retraction_enable",
@ -251,6 +259,8 @@
"unit": "mm/s",
"type": "float",
"default": 20,
"min_value": "0.1",
"max_value_warning": "300",
"visible": false,
"enabled": "retraction_enable"
},
@ -260,6 +270,8 @@
"unit": "mm/s",
"type": "float",
"default": 20,
"min_value": "0.1",
"max_value_warning": "300",
"visible": false,
"enabled": "retraction_enable"
}