3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b61714bb3e
PrusaSlicer-NonPlainar/xs/xsp
History
Lukas Matena b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED): 
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
..
BoundingBox.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
Config.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
ExPolygon.xsp Further Perl unit test porting to C++ and Perl interface reduction: 2022-05-05 17:57:57 +02:00
ExtrusionEntityCollection.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
ExtrusionLoop.xsp Follow-up to d547279aea40460e7ccfe7c5a4b77a6ef433e9bf: Some of the unit tests use unscaled coordinates, because of that, we will use for them ExtrusionLoop::split_at with zero epsilon. 2022-06-28 10:30:04 +02:00
ExtrusionPath.xsp Ported "avoid crossing perimeters" and bridging unit tests from Perl 2022-05-04 18:21:08 +02:00
Geometry.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
Layer.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
Line.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
Model.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
my.map Further Perl unit test porting to C++ and Perl interface reduction: 2022-05-05 17:57:57 +02:00
mytype.map New XS framework for C and C++ code 2013-06-22 17:16:45 +02:00
PerimeterGenerator.xsp Fixed unit tests. 2022-06-01 21:41:40 +02:00
Point.xsp Removed various Point::ccw() and Point::ccw_angle() methods, they were 2022-04-25 12:42:51 +02:00
Polygon.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
Polyline.xsp Perl unit tests for perimeters and multi-material were rewritten to C++. 2022-05-04 15:06:04 +02:00
Print.xsp Ported custom_gcode and print unit tests from Perl to C++. 2022-05-06 18:30:18 +02:00
Surface.xsp Perl unit tests for perimeters and multi-material were rewritten to C++. 2022-05-04 15:06:04 +02:00
SurfaceCollection.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
TriangleMesh.xsp Further slimming of Perl bindings. 2022-05-04 19:10:34 +02:00
typemap.xspt Further Perl unit test porting to C++ and Perl interface reduction: 2022-05-05 17:57:57 +02:00
XS.xsp Perl unit tests for perimeters and multi-material were rewritten to C++. 2022-05-04 15:06:04 +02:00