mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
Merge branch 'master-remote' into SoftFever
# Conflicts: # resources/profiles/Creality.json # resources/profiles/Voron.json # version.inc
This commit is contained in:
commit
6fb941cf4c
26 changed files with 224 additions and 70 deletions
|
@ -1025,7 +1025,7 @@ void PrintConfigDef::init_fff_params()
|
|||
def = this->add("extruder_clearance_height_to_rod", coFloat);
|
||||
def->label = L("Height to rod");
|
||||
def->tooltip = L("Distance of the nozzle tip to the lower rod. "
|
||||
"Used as input of auto-arranging to avoid collision when printing by object");
|
||||
"Used for collision avoidance in by-object printing.");
|
||||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
|
@ -1035,7 +1035,7 @@ void PrintConfigDef::init_fff_params()
|
|||
def = this->add("extruder_clearance_height_to_lid", coFloat);
|
||||
def->label = L("Height to lid");
|
||||
def->tooltip = L("Distance of the nozzle tip to the lid. "
|
||||
"Used as input of auto-arranging to avoid collision when printing by object");
|
||||
"Used for collision avoidance in by-object printing.");
|
||||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
|
@ -1043,12 +1043,20 @@ void PrintConfigDef::init_fff_params()
|
|||
|
||||
def = this->add("extruder_clearance_radius", coFloat);
|
||||
def->label = L("Radius");
|
||||
def->tooltip = L("Clearance radius around extruder. Used as input of auto-arranging to avoid collision when printing by object");
|
||||
def->tooltip = L("Clearance radius around extruder. Used for collision avoidance in by-object printing.");
|
||||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(40));
|
||||
|
||||
def = this->add("extruder_clearance_max_radius", coFloat);
|
||||
def->label = L("Max Radius");
|
||||
def->tooltip = L("Max clearance radius around extruder. Used for collision avoidance in by-object printing.");
|
||||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(68));
|
||||
|
||||
def = this->add("extruder_colour", coStrings);
|
||||
def->label = L("Extruder Color");
|
||||
def->tooltip = L("Only used as a visual help on UI");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue