3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-27 10:41:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-05-28 15:50:21 +02:00
commit e9d57c932a
18 changed files with 230 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/PrintConfig.cpp
View file

@ -85,6 +85,8 @@ void PrintConfigDef::init_common_params()
def->label = L("Max print height");
def->tooltip = L("Set this to the maximum height that can be reached by your extruder while printing.");
def->sidetext = L("mm");
def->min = 0;
def->max = 1200;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(200.0));

3
src/libslic3r/Technologies.hpp
View file

@ -42,6 +42,9 @@
// Enable rendering of objects colored by facets' slope
#define ENABLE_SLOPE_RENDERING (1 && ENABLE_2_3_0_ALPHA1)
// Enable rendering of objects using environment map
#define ENABLE_ENVIRONMENT_MAP (1 && ENABLE_2_3_0_ALPHA1)
// Enable G-Code viewer
#define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1)
#define ENABLE_GCODE_VIEWER_STATISTICS (0 && ENABLE_GCODE_VIEWER)