Enrico Turri 835ee148e5 Fixed conflicts after merging with master

2019-10-09 11:17:48 +02:00

..

3mf.cpp

ENABLE_ENHANCED_RELOAD_FROM_DISK set as default

2019-09-23 15:35:49 +02:00

3mf.hpp

Added version check for .3mf and .amf project files. PrusaSlicer will refuse to import files with newer version numbers.

2019-08-23 13:12:31 +02:00

AMF.cpp

Fixed conflicts after merging with master

2019-10-09 11:17:48 +02:00

AMF.hpp

Added version check for .3mf and .amf project files. PrusaSlicer will refuse to import files with newer version numbers.

2019-08-23 13:12:31 +02:00

OBJ.cpp

Make loading of obj files into TriangleMesh possible.

2019-10-01 14:58:37 +02:00

OBJ.hpp

Make loading of obj files into TriangleMesh possible.

2019-10-01 14:58:37 +02:00

objparser.cpp

Follow-up of 9b5edbfa5f -> added comments

2019-09-09 11:50:19 +02:00

objparser.hpp

…

PRUS.cpp

PRUS.cpp: Fixed an always-true condition in extract_model_from_archive

2019-09-24 18:09:48 +02:00

PRUS.hpp

…

STL.cpp

Refactored admesh to get rid of the error and fp members of stl_file.

2019-06-10 17:17:36 +02:00

STL.hpp

…