../src/libslic3r/Format/3mf.cpp:686:37: error: 'path' is not a member of 'boost::filesystem'; did you mean 'boost::property_tree::path'?
../src/libslic3r/Format/3mf.cpp:2437:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2445:36: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2455:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2464:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2473:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2482:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2491:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2500:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2506:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2515:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2524:36: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2535:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2541:32: error: 'remove' is not a member of 'boost::filesystem'
../src/libslic3r/Format/3mf.cpp:2650:62: error: 'path' is not a member of 'boost::filesystem'; did you mean 'boost::property_tree::path'?
../src/libslic3r/Format/3mf.cpp:3315:129: error: 'path' is not a member of 'boost::filesystem'; did you mean 'boost::property_tree::path'?
CMake handling is different
STEP: Removed preprocessing stage
STEP: Small refactoring
STEP: Bigger refactoring
STEP: Changed naming on loaded object and volumes:
If the STEP contains exactly one named volume, the object and its first
volume will both have that name. Otherwise, filename w/o suffix is used
as object name and volumes are named using names from the STEP (if there
is none, untranslated "PartN" string is used).
STEP: Load the libraries dynamically on Win
wip
That allows computed better values in cases when the extrusion width of the first layer or for the infill differs from the extrusion width for perimeters.
Parameters min_feature_size and wall_transition_length now can be set in percentages, and then they will be calculated based on nozzle size. Old profiles with default values are forced to replace old default values with new default values in percentages.
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250. Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250. Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.