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

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
enricoturri1966
2020-05-27 10:32:02 +02:00
parent aa04f0e555 e6317cdefb
commit 2eb4b2caed
68 changed files with 467 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/fff_print/test_print.cpp
View File

@@ -2,6 +2,7 @@
#include "libslic3r/libslic3r.h"
#include "libslic3r/Print.hpp"
#include "libslic3r/Layer.hpp"
#include "test_data.hpp"

1
tests/fff_print/test_printobject.cpp
View File

@@ -2,6 +2,7 @@
#include "libslic3r/libslic3r.h"
#include "libslic3r/Print.hpp"
#include "libslic3r/Layer.hpp"
#include "test_data.hpp"

1
tests/fff_print/test_support_material.cpp
View File

@@ -1,6 +1,7 @@
#include <catch2/catch.hpp>
#include "libslic3r/GCodeReader.hpp"
#include "libslic3r/Layer.hpp"
#include "test_data.hpp" // get access to init_print, etc