Simon Edwards fd42a43270 Merge branch 'master' into simple_convex_hull ...

Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py

2016-06-21 14:47:10 +02:00

..

3MFReader

Bump API version of plugins that do not need extra porting

2016-05-30 15:29:10 +02:00

AutoSave

Update AutoSave plugin to work with the new settings API

2016-05-30 15:29:10 +02:00

ChangeLogPlugin

Merge branch '2.1'

2016-06-04 19:11:59 +02:00

CuraEngineBackend

Merge branch 'master' into simple_convex_hull

2016-06-21 14:47:10 +02:00

CuraProfileReader

Support for importing a profile.

2016-06-09 14:14:50 +02:00

CuraProfileWriter

Move ProfileReader and ProfileWriter over to Cura itself.

2016-06-09 14:14:49 +02:00

GCodeProfileReader

Codestyle & documentation

2016-04-28 16:01:54 +02:00

GCodeWriter

Properly serialise all settings to g-code file

2016-05-24 03:00:16 +02:00

ImageReader

Merge branch 'master' into simple_convex_hull

2016-06-21 14:47:10 +02:00

LayerView

Merge branch 'master' into simple_convex_hull

2016-06-21 14:47:10 +02:00

LegacyProfileReader

Merge branch 'settings_rework'

2016-05-25 15:12:25 +02:00

PerObjectSettingsTool

Redesign extruder selection widget

2016-06-13 18:23:53 +02:00

RemovableDriveOutputDevice

Bump API version of plugins that do not need extra porting

2016-05-30 15:29:10 +02:00

SliceInfoPlugin

Using PyDev compatible tag

2016-03-15 12:54:41 +01:00

SolidView

Fix uses of getValue after its removal from Uranium API

2016-05-18 16:45:44 +02:00

USBPrinting

Merge pull request #804 from thopiekar/master-eclipse-markers

2016-06-16 11:07:27 +02:00

XmlMaterialProfile

Add support for some additional properties to XmlMaterialProfile

2016-06-02 08:10:55 +02:00

XRayView

Increment XRayView API number

2016-05-20 16:22:10 +02:00