pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d

Browse Source
This commit is contained in:
tamasmeszaros
2018-09-13 12:10:59 +02:00
parent 3c6afedcb1 2e734720b5
commit bef19fe6da
15 changed files with 517 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/libslic3r/Format/3mf.cpp
View File

@@ -601,8 +601,6 @@ namespace Slic3r {
if (!_generate_volumes(*object.second, obj_geometry->second, *volumes_ptr))
return false;
object.second->center_around_origin();
}
// fixes the min z of the model if negative

2
xs/src/libslic3r/GCodeTimeEstimator.cpp
View File

@@ -301,7 +301,7 @@ namespace Slic3r {
if (((_mode == Normal) && (gcode_line == Normal_First_M73_Output_Placeholder_Tag)) ||
((_mode == Silent) && (gcode_line == Silent_First_M73_Output_Placeholder_Tag)))
{
sprintf(time_line, time_mask.c_str(), std::to_string(0), _get_time_minutes(_time).c_str());
sprintf(time_line, time_mask.c_str(), "0", _get_time_minutes(_time).c_str());
gcode_line = time_line;
}
else