1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-08-01 11:25:50 +00:00

Merge remote-tracking branch 'origin/master' into feature_slice_to_png

This commit is contained in:
tamasmeszaros
2018-07-03 11:40:35 +02:00
11 changed files with 108 additions and 110 deletions
+2 -2
View File
@@ -142,10 +142,10 @@ public:
}
m_gcode += "G1";
if (std::abs(dx) > EPSILON)
if (std::abs(rot.x - rotated_current_pos.x) > EPSILON)
m_gcode += set_format_X(rot.x);
if (std::abs(dy) > EPSILON)
if (std::abs(rot.y - rotated_current_pos.y) > EPSILON)
m_gcode += set_format_Y(rot.y);
if (e != 0.f)
+1 -1
View File
@@ -14,7 +14,7 @@
#include <boost/thread.hpp>
#define SLIC3R_FORK_NAME "Slic3r Prusa Edition"
#define SLIC3R_VERSION "1.40.0"
#define SLIC3R_VERSION "1.40.1-rc"
#define SLIC3R_BUILD "UNKNOWN"
typedef int32_t coord_t;