Ghostkeeper 4ef9c1a3e7 Merge branch '2.1' ...

Conflicts:
	plugins/CuraEngineBackend/StartSliceJob.py

2016-05-04 13:43:35 +02:00

..

3MFReader

Merge branch '2.1'

2016-04-04 18:49:09 +02:00

AutoSave

Properly save setting visibility when auto saving

2016-02-17 14:38:38 +01:00

ChangeLogPlugin

Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX

2016-04-12 10:23:43 +02:00

CuraEngineBackend

Merge branch '2.1'

2016-05-04 13:43:35 +02:00

CuraProfileReader

Codestyle & documentation

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

CuraProfileWriter

Codestyle & documentation

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

GCodeProfileReader

Codestyle & documentation

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

GCodeWriter

Codestyle & documentation

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

ImageReader

Fix color of some texts on Linux with dark theme

2016-04-07 18:57:11 +02:00

LayerView

Set the default number of layers and current layer to 0. Now the layer view slider is empty while the initial slicing process is running.

2016-04-28 13:07:57 +02:00

LegacyProfileReader

Merge branch '2.1'

2016-03-17 15:24:00 +01:00

PerObjectSettingsTool

Merge branch '2.1'

2016-03-17 15:24:00 +01:00

RemovableDriveOutputDevice

Merge branch '2.1' of https://github.com/Ultimaker/Cura

2016-04-08 15:02:30 +02:00

SliceInfoPlugin

Using PyDev compatible tag

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

SolidView

Merge branch '2.1'

2016-04-04 18:49:09 +02:00

USBPrinting

Added bq firmware (which caused merge issue)

2016-04-18 15:48:20 +02:00

XRayView

Added weight to viewmode plugins for sorting in the viewmode

2015-12-30 09:53:25 +01:00