Merge branch 'master' into simple-mode

This commit is contained in:
Alessandro Ranellucci 2013-03-08 22:28:13 +01:00
commit b901e1f6c8
48 changed files with 1711 additions and 711 deletions

View file

@ -466,6 +466,10 @@ sub build {
},
],
},
{
title => 'Advanced',
options => [qw(avoid_crossing_perimeters)],
},
]);
$self->add_options_page('Infill', 'shading.png', optgroups => [
@ -475,7 +479,8 @@ sub build {
},
{
title => 'Advanced',
options => [qw(infill_every_layers solid_infill_every_layers fill_angle solid_infill_below_area only_retract_when_crossing_perimeters)],
options => [qw(infill_every_layers infill_only_where_needed solid_infill_every_layers fill_angle
solid_infill_below_area only_retract_when_crossing_perimeters)],
},
]);
@ -492,6 +497,10 @@ sub build {
title => 'Modifiers',
options => [qw(first_layer_speed)],
},
{
title => 'Acceleration control (advanced)',
options => [qw(perimeter_acceleration infill_acceleration default_acceleration)],
},
]);
$self->add_options_page('Skirt and brim', 'box.png', optgroups => [
@ -508,7 +517,16 @@ sub build {
$self->add_options_page('Support material', 'building.png', optgroups => [
{
title => 'Support material',
options => [qw(support_material support_material_threshold support_material_pattern support_material_spacing support_material_angle)],
options => [qw(support_material support_material_threshold support_material_enforce_layers)],
},
{
title => 'Raft',
options => [qw(raft_layers)],
},
{
title => 'Options for support material and raft',
options => [qw(support_material_pattern support_material_spacing support_material_angle
support_material_interface_layers support_material_interface_spacing)],
},
]);
@ -554,7 +572,7 @@ sub build {
{
title => 'Extrusion width',
label_width => 180,
options => [qw(extrusion_width first_layer_extrusion_width perimeter_extrusion_width infill_extrusion_width support_material_extrusion_width)],
options => [qw(extrusion_width first_layer_extrusion_width perimeter_extrusion_width infill_extrusion_width top_infill_extrusion_width support_material_extrusion_width)],
},
{
title => 'Flow',