mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-20 13:17:54 -06:00
Merge branch 'master' into avoid-crossing-perimeters
Conflicts: README.markdown lib/Slic3r/Config.pm lib/Slic3r/GCode.pm lib/Slic3r/Print.pm slic3r.pl
This commit is contained in:
commit
cc8d8bd26f
34 changed files with 531 additions and 267 deletions
|
@ -178,6 +178,7 @@ our $Options = {
|
|||
# extruder mapping
|
||||
'perimeter_extruder' => {
|
||||
label => 'Perimeter extruder',
|
||||
tooltip => 'The extruder to use when printing perimeters.',
|
||||
cli => 'perimeter-extruder=i',
|
||||
type => 'i',
|
||||
aliases => [qw(perimeters_extruder)],
|
||||
|
@ -185,12 +186,14 @@ our $Options = {
|
|||
},
|
||||
'infill_extruder' => {
|
||||
label => 'Infill extruder',
|
||||
tooltip => 'The extruder to use when printing infill.',
|
||||
cli => 'infill-extruder=i',
|
||||
type => 'i',
|
||||
default => 1,
|
||||
},
|
||||
'support_material_extruder' => {
|
||||
label => 'Support material extruder',
|
||||
tooltip => 'The extruder to use when printing support material. This affects brim too.',
|
||||
cli => 'support-material-extruder=i',
|
||||
type => 'i',
|
||||
default => 1,
|
||||
|
@ -477,6 +480,13 @@ our $Options = {
|
|||
type => 'bool',
|
||||
default => 0,
|
||||
},
|
||||
'only_retract_when_crossing_perimeters' => {
|
||||
label => 'Only retract when crossing perimeters',
|
||||
tooltip => 'Disables retraction when travelling between infill paths inside the same island.',
|
||||
cli => 'only-retract-when-crossing-perimeters!',
|
||||
type => 'bool',
|
||||
default => 0,
|
||||
},
|
||||
'support_material' => {
|
||||
label => 'Generate support material',
|
||||
tooltip => 'Enable support material generation.',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue