Merge branch 'feature_remove_global_tab' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2016-07-25 10:47:52 +02:00
commit 6883747671
12 changed files with 358 additions and 10402 deletions

View file

@ -630,6 +630,7 @@
"type": "float",
"enabled": "support_enable",
"value": "line_width",
"global_inherits_stack": "support_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@ -644,6 +645,7 @@
"type": "float",
"enabled": "support_roof_enable",
"value": "line_width",
"global_inherits_stack": "support_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@ -1443,6 +1445,7 @@
"maximum_value_warning": "150",
"default_value": 60,
"value": "speed_print",
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -1459,6 +1462,7 @@
"maximum_value": "299792458000",
"maximum_value_warning": "150",
"value": "speed_support",
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": false,
"settable_per_extruder": false
@ -1475,6 +1479,7 @@
"maximum_value_warning": "150",
"enabled": "support_roof_enable and support_enable",
"value": "speed_support / 1.5",
"global_inherits_stack": "support_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": false
}
@ -1646,6 +1651,7 @@
"maximum_value_warning": "10000",
"default_value": 3000,
"value": "acceleration_print",
"global_inherits_stack": "support_extruder_nr",
"enabled": "acceleration_enabled and support_enable",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -1657,6 +1663,7 @@
"type": "float",
"default_value": 3000,
"value": "acceleration_support",
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0.1",
"minimum_value_warning": "100",
"maximum_value_warning": "10000",
@ -1671,6 +1678,7 @@
"type": "float",
"default_value": 3000,
"value": "acceleration_support",
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0.1",
"minimum_value_warning": "100",
"maximum_value_warning": "10000",
@ -1834,6 +1842,7 @@
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
"global_inherits_stack": "support_extruder_nr",
"enabled": "jerk_enabled and support_enable",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -1845,6 +1854,7 @@
"type": "float",
"default_value": 20,
"value": "jerk_support",
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0.1",
"minimum_value_warning": "5",
"maximum_value_warning": "50",
@ -1859,6 +1869,7 @@
"type": "float",
"default_value": 20,
"value": "jerk_support",
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0.1",
"minimum_value_warning": "5",
"maximum_value_warning": "50",
@ -2123,7 +2134,8 @@
"description": "Enable support structures. These structures support parts of the model with severe overhangs.",
"type": "bool",
"default_value": false,
"settable_per_mesh": true
"settable_per_mesh": true,
"settable_per_extruder": false
},
"support_type":
{
@ -2149,6 +2161,7 @@
"minimum_value": "0",
"maximum_value": "90",
"default_value": 50,
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2217,6 +2230,7 @@
"minimum_value": "0",
"maximum_value_warning": "10",
"default_value": 0.15,
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true,
"children":
@ -2232,6 +2246,7 @@
"type": "float",
"enabled": "support_enable",
"value": "support_z_distance",
"global_inherits_stack": "support_extruder_nr",
"settable_per_mesh": true
},
"support_bottom_distance":
@ -2243,6 +2258,7 @@
"maximum_value_warning": "10",
"default_value": 0.1,
"value": "0.1 if support_type == 'everywhere' else 0",
"global_inherits_stack": "support_extruder_nr",
"type": "float",
"enabled": "support_enable and support_type == 'everywhere'",
"settable_per_mesh": true
@ -2258,6 +2274,7 @@
"minimum_value": "0",
"maximum_value_warning": "10",
"default_value": 0.7,
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2270,6 +2287,7 @@
"z_overrides_xy": "Z overrides X/Y"
},
"default_value": "z_overrides_xy",
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2282,6 +2300,7 @@
"maximum_value_warning": "10",
"default_value": 0.2,
"value": "machine_nozzle_size / 2",
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable and support_xy_overrides_z=='z_overrides_xy'",
"settable_per_mesh": true
},
@ -2292,6 +2311,7 @@
"unit": "mm",
"type": "float",
"default_value": 0.3,
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0",
"maximum_value_warning": "1.0",
"enabled": "support_enable",
@ -2304,6 +2324,7 @@
"unit": "mm",
"type": "float",
"default_value": 2.0,
"global_inherits_stack": "support_extruder_nr",
"minimum_value_warning": "0",
"maximum_value_warning": "10",
"enabled": "support_enable",
@ -2316,6 +2337,7 @@
"unit": "mm",
"type": "float",
"default_value": 0.2,
"global_inherits_stack": "support_extruder_nr",
"minimum_value_warning": "-0.5",
"maximum_value_warning": "5.0",
"enabled": "support_enable",
@ -2328,6 +2350,7 @@
"unit": "mm",
"type": "float",
"default_value": 0.6,
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0",
"maximum_value_warning": "1.0",
"enabled": "support_enable",
@ -2339,6 +2362,7 @@
"description": "Generate a dense top skin at the top of the support on which the model is printed.",
"type": "bool",
"default_value": false,
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2350,6 +2374,7 @@
"type": "float",
"default_value": 1,
"minimum_value": "0",
"global_inherits_stack": "support_extruder_nr",
"maximum_value_warning": "10",
"enabled": "support_roof_enable and support_enable",
"settable_per_mesh": true
@ -2407,6 +2432,7 @@
"description": "Use specialized towers to support tiny overhang areas. These towers have a larger diameter than the region they support. Near the overhang the towers' diameter decreases, forming a roof.",
"type": "bool",
"default_value": true,
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2417,6 +2443,7 @@
"unit": "mm",
"type": "float",
"default_value": 3.0,
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0",
"maximum_value_warning": "10",
"enabled": "support_enable and support_use_towers",
@ -2429,6 +2456,7 @@
"unit": "mm",
"type": "float",
"default_value": 3.0,
"global_inherits_stack": "support_extruder_nr",
"minimum_value": "0",
"maximum_value_warning": "10",
"maximum_value": "support_tower_diameter",
@ -2444,6 +2472,7 @@
"minimum_value": "0",
"maximum_value": "90",
"default_value": 65,
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable and support_use_towers",
"settable_per_mesh": true
}