Revert "Merge branch 'SoftFever' into feature/calib"

This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
This commit is contained in:
SoftFever 2022-12-25 12:39:45 +08:00
parent de33c24b0a
commit a688719e72
53 changed files with 1228 additions and 498 deletions

View file

@ -1,6 +1,6 @@
#ifndef slic3r_Format_3mf_hpp_
#define slic3r_Format_3mf_hpp_
#include <expat.h>
#include "../expat.h"
namespace Slic3r {
// PrusaFileParser is used to check 3mf file is from Prusa