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

This commit is contained in:
tamasmeszaros committed 2018-09-13 12:10:59 +02:00
commit bef19fe6da
15 files changed
+517 -146

No files matched your search

-2
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
+1 -1
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