3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-09 14:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into avoid-crossing-perimeters

Browse source 
Conflicts:
	lib/Slic3r/GCode.pm
This commit is contained in:
Alessandro Ranellucci 2012-10-24 11:49:31 +02:00
commit 1627268fd4
35 changed files with 1544 additions and 1159 deletions
Download patch file Download diff file Expand all files Collapse all files

6
slic3r.pl
View file

@ -88,9 +88,9 @@ if (@ARGV) { # slicing from command line
while (my $input_file = shift @ARGV) {
my $print = Slic3r::Print->new(config => $config);
$print->add_objects_from_file($input_file);
$print->add_model(Slic3r::Model->read_from_file($input_file));
if ($opt{merge}) {
$print->add_objects_from_file($_) for splice @ARGV, 0;
$print->add_model(Slic3r::Model->read_from_file($_)) for splice @ARGV, 0;
}
$print->duplicate;
$print->arrange_objects if @{$print->objects} > 1;
@ -201,6 +201,8 @@ $j
--first-layer-height Layer height for first layer (mm or %, default: $config->{first_layer_height})
--infill-every-layers
Infill every N layers (default: $config->{infill_every_layers})
--solid-infill-every-layers
Force a solid layer every N layers (default: $config->{solid_infill_every_layers})
Print options:
--perimeters Number of perimeters/horizontal skins (range: 0+, default: $config->{perimeters})