juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-02 18:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Enrico Turri
2018-07-12 08:32:18 +02:00
parent 3dba0be81e fa86d776cb
commit 1356a9977e
12 changed files with 131 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
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)

2
xs/src/libslic3r/libslic3r.h
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"
#define SLIC3R_BUILD "UNKNOWN"
typedef int32_t coord_t;