Ghostkeeper de9a66e1f4 Merge branch '2.1' ...

Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile

2016-03-17 15:24:00 +01: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

Removing more unneeded imports

2016-03-14 17:26:21 +01: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

Marking another unused variable

2016-03-15 12:09:49 +01: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

Removing unused imports and rename built-in varibales/functions into save one

2016-03-15 12:18:44 +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

Fixed order of one at a time printing

2016-03-02 14:49:54 +01:00

PlatformPhysics.py

Merge branch '2.1'

2016-03-17 15:24:00 +01: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