Ghostkeeper 0684cee681 Merge branch '2.1' ... Conflicts: resources/machines/fdmprinter.json resources/machines/innovo-inventor.json resources/profiles/general/High+Quality.cfg resources/profiles/general/Low+Quality.cfg resources/profiles/general/Normal+Quality.cfg resources/profiles/general/Ulti+Quality.cfg resources/profiles/ultimaker2+/pla_0.4_high.curaprofile		2016-04-04 18:49:09 +02:00
..
__init__.py	Move src to cura so we can use the same package for installed and source	2015-05-18 15:03:42 +02:00
BuildVolume.py	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
CameraAnimation.py	Move src to cura so we can use the same package for installed and source	2015-05-18 15:03:42 +02:00
ConvexHullDecorator.py	Code cleanup	2016-03-02 14:49:41 +01:00
ConvexHullJob.py	Also take points on Z=0 with convex hull	2016-03-03 16:14:59 +01:00
ConvexHullNode.py	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
CrashHandler.py	Fix crash handler to not complain about debug_mode not being set	2015-10-08 15:28:38 +02:00
CuraActions.py	Removing unused imports	2016-03-15 12:17:59 +01:00
CuraApplication.py	Cleanups in cura/CuraApplication.py	2016-03-15 12:14:18 +01:00
CuraSplashScreen.py	Fix splashscreen size on HiDPI (windows) screens	2015-12-30 09:53:26 +01:00
CuraVersion.py.in	Make it possible to set Cura version from CMake	2015-11-01 22:02:54 +01:00
LayerData.py	Complete the renaming of a parameter	2016-03-21 15:33:04 +01:00
LayerDataDecorator.py	Moved LayerData & Decorator outside of backend plugin	2015-09-23 15:01:48 +02:00
MultiMaterialDecorator.py	Added merging for multi material	2015-07-27 14:25:27 +02:00
OneAtATimeIterator.py	One at a time iterator no longer ignores objects higher than gantry height	2016-04-04 11:25:41 +02:00
PlatformPhysics.py	Merge branch '2.1'	2016-04-04 18:49:09 +02:00
PlatformPhysicsOperation.py	Removing unused imports	2016-03-15 12:17:59 +01:00
PrintInformation.py	Removing unused imports	2016-03-15 12:17:59 +01:00
ZOffsetDecorator.py	Removed stray debug print	2016-02-17 17:02:41 +01:00