Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview

This commit is contained in:
Enrico Turri 2018-01-08 13:45:57 +01:00
commit c9839dd7cc
12 changed files with 2024 additions and 2399 deletions

View file

@ -400,6 +400,7 @@ void GCode::_do_export(Print &print, FILE *file)
// resets time estimator
m_time_estimator.reset();
m_time_estimator.set_dialect(print.config.gcode_flavor);
//############################################################################################################
#if ENRICO_GCODE_PREVIEW