PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-14 19:12:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer

Browse Source
This commit is contained in:
Vojtech Bubnik
2020-12-14 12:47:59 +01:00
parent b5f95dd4b4 530148575b
commit e90120994e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/PrintConfig.cpp
View File

@@ -193,7 +193,11 @@ void PrintConfigDef::init_fff_params()
def->sidetext = L("mm (zero to disable)");
def->min = 0;
def->mode = comExpert;
<<<<<<< HEAD
def->set_default_value(new ConfigOptionFloatOrPercent(0., false));
=======
def->set_default_value(new ConfigOptionFloatOrPercent(0.));
>>>>>>> 530148575b06fbf423166ced0d57c7b9eeca1dd4
def = this->add("bed_temperature", coInts);
def->label = L("Other layers");