Merge branch 'master' into xs

This commit is contained in:
Alessandro Ranellucci 2013-07-06 11:38:40 +02:00
commit 28f8083ab7
7 changed files with 87 additions and 15 deletions

View file

@ -398,7 +398,7 @@ sub build {
},
{
title => 'Vertical shells',
options => [qw(perimeters randomize_start extra_perimeters)],
options => [qw(perimeters spiral_vase)],
},
{
title => 'Horizontal shells',
@ -410,9 +410,23 @@ sub build {
},
],
},
{
title => 'Quality (slower slicing)',
options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang thin_walls overhangs)],
lines => [
Slic3r::GUI::OptionsGroup->single_option_line('extra_perimeters'),
Slic3r::GUI::OptionsGroup->single_option_line('avoid_crossing_perimeters'),
{
label => 'Start perimeters at',
options => [qw(start_perimeters_at_concave_points start_perimeters_at_non_overhang)],
},
Slic3r::GUI::OptionsGroup->single_option_line('thin_walls'),
Slic3r::GUI::OptionsGroup->single_option_line('overhangs'),
],
},
{
title => 'Advanced',
options => [qw(avoid_crossing_perimeters external_perimeters_first spiral_vase)],
options => [qw(randomize_start external_perimeters_first)],
},
]);
@ -421,9 +435,13 @@ sub build {
title => 'Infill',
options => [qw(fill_density fill_pattern solid_fill_pattern)],
},
{
title => 'Reducing printing time',
options => [qw(infill_every_layers infill_only_where_needed)],
},
{
title => 'Advanced',
options => [qw(infill_every_layers infill_only_where_needed solid_infill_every_layers fill_angle
options => [qw(solid_infill_every_layers fill_angle
solid_infill_below_area only_retract_when_crossing_perimeters infill_first)],
},
]);