Merge branch 'master' into wipe_tower_improvements

2018-06-21 10:41:01 +02:00
parent bc5bd1b42b 2cd0c64b96
commit 6669357c81
47 changed files with 5724 additions and 6848 deletions
--- a/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
+++ b/xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
@@ -242,7 +242,6 @@ private:
 	bool 			m_left_to_right   = true;
 	float			m_extra_spacing   = 1.f;

-
 	// Calculates extrusion flow needed to produce required line width for given layer height
 	float extrusion_flow(float layer_height = -1.f) const	// negative layer_height - return current m_extrusion_flow
 	{