Skip to content

Commit

Permalink
bugfix prusa3d#139 (allow beta config when release is higher.
Browse files Browse the repository at this point in the history
update tooltip for ironing presets
  • Loading branch information
supermerill committed Jan 12, 2020
1 parent 2c287a1 commit 6bd13bd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions src/libslic3r/PrintConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,8 @@ void PrintConfigDef::init_fff_params()
def->label = L("width");
def->full_label = L("Ironing width");
def->category = OptionCategory::infill;
def->tooltip = L("This is the width of the ironing pass, in a % of the top extrusion width, should not be more than 50%.");
def->tooltip = L("This is the width of the ironing pass, in a % of the top extrusion width, should not be more than 50%"
" (two times more lines, 50% overlap). It's not necessary to go below 25% (four times more lines, 75% overlap)");
def->min = 0;
def->mode = comExpert;
def->set_default_value(new ConfigOptionFloatOrPercent(50, true));
Expand All @@ -1243,8 +1244,9 @@ void PrintConfigDef::init_fff_params()
def->label = L("distribution");
def->full_label = L("Ironing flow distribution");
def->category = OptionCategory::infill;
def->tooltip = L("This is the percentage of the flow that is used for the second ironing pass. Typical 0-20%. "
"Should not be higher than 20%, unless you have your top extrusion width greatly superior to your nozzle width.");
def->tooltip = L("This is the percentage of the flow that is used for the second ironing pass. Typical 10-20%. "
"Should not be higher than 20%, unless you have your top extrusion width greatly superior to your nozzle width. "
"A value too low and your extruder will eat the filament. A value too high and the first pass won't print well.");
//def->min = 0;
//def->max = 0.9;
def->mode = comExpert;
Expand Down
4 changes: 2 additions & 2 deletions src/slic3r/Config/Version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ bool Version::is_slic3r_supported(const Semver &slic3r_version) const
// Released config is always supported.
return true;
else if (prerelease_slic3r == nullptr)
// Released slic3r only supports released configs.
return false;
// Released slic3r only supports released configs unless it's far ahead.
return slic3r_version >= min_slic3r_version;
// Compare the pre-release status of Slic3r against the config.
// If the prerelease status of slic3r is lexicographically lower or equal
// to the prerelease status of the config, accept it.
Expand Down

0 comments on commit 6bd13bd

Please sign in to comment.