Jack Ha 8854a28d56 CURA-4525 solved merge conflict

2018-01-04 10:24:30 +01:00

..

3MFReader

Move all decorators in the scene subfolder

2018-01-03 15:09:19 +01:00

3MFWriter

Solved merge conflicts. CURA-4525

2017-12-21 10:52:51 +01:00

AutoSave

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ChangeLogPlugin

Correct description of SOLIDWORKS macro

2017-12-06 00:53:43 +01:00

CuraEngineBackend

CURA-4525 solved merge conflict

2018-01-04 10:24:30 +01:00

CuraProfileReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

CuraProfileWriter

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

FirmwareUpdateChecker

Made the message more clear

2017-11-08 10:23:19 +01:00

GCodeProfileReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

GCodeReader

Move all decorators in the scene subfolder

2018-01-03 15:09:19 +01:00

GCodeWriter

Solved merge conflicts. CURA-4525

2017-12-21 10:52:51 +01:00

ImageReader

CURA-4525 cleanups and change comment and added new-lines

2018-01-03 15:41:08 +01:00

LegacyProfileReader

Use unique name too if importing multiple legacy profiles

2017-12-19 17:36:20 +01:00

MachineSettingsAction

Fix container_index for MachineSettingsAction

2018-01-03 17:04:40 +01:00

MonitorStage

Monitor view component loader should have width and height from parent

2017-12-08 14:56:03 +01:00

PerObjectSettingsTool

CURA-4495 Change property name and add default values

2017-12-18 11:58:34 +01:00

PluginBrowser

Cleanup plugin browser dialog creation - CURA-4568

2017-11-28 15:02:17 +01:00

PrepareStage

Fix sidebar loading and unloading depending on active stage

2017-12-06 17:46:18 +01:00

RemovableDriveOutputDevice

Add stderr to send errors to

2017-11-14 11:53:24 +01:00

SimulationView

Move all decorators in the scene subfolder

2018-01-03 15:09:19 +01:00

SliceInfoPlugin

CURA-4525 solved merge conflicts

2018-01-03 13:52:55 +01:00

SolidView

Fix SolidView to use isNonPrintingMesh decorator call

2017-12-20 16:48:57 +01:00

UltimakerMachineActions

Fix toggling UM2 upgrades on extruder 0 - CURA-4626

2017-11-27 17:35:57 +01:00

UM3NetworkPrinting

For this version, send all build plates. No print view when multiple build plates. CURA-4525

2017-12-21 15:47:40 +01:00

USBPrinting

Use new method of setting active stage when needing to switch to monitor

2017-12-07 11:56:52 +01:00

UserAgreementPlugin

Merge branch '3.1'

2017-11-30 16:57:01 +01:00

VersionUpgrade

Fix version upgrade 30 to 31

2018-01-02 10:47:21 +01:00

X3DReader

CURA-4525 cleanups and change comment and added new-lines

2018-01-03 15:41:08 +01:00

XmlMaterialProfile

Remove overzealeous log message

2017-12-18 13:29:10 +01:00

XRayView

Add fix and doc for Mac OpenGL crash

2017-12-21 15:43:35 +01:00