ChrisTerBeke b2d3d15011 Fix conflicts

2018-01-11 09:06:59 +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 move reset print information to a better place to prevent it sending info of non existent build plates

2018-01-10 16:04:56 +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

CURA-4778 Add up to 8 different colors when loading a GCode, since we

2018-01-09 10:42:03 +01:00

GCodeWriter

CURA-4525 fix saving empty gcode giving error

2018-01-10 14:25:09 +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

Fix conflicts

2018-01-11 09:06:59 +01:00

PerObjectSettingsTool

Merge pull request #3089 from fieldOfView/feature_support_mesh_enhancements

2018-01-10 11:58:22 +01:00

PluginBrowser

Cleanup plugin browser dialog creation - CURA-4568

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

PostProcessingPlugin

Add post processing source files

2018-01-09 10:31:12 +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

CURA-4778 Add up to 8 different colors when loading a GCode, since we

2018-01-09 10:42:03 +01:00

SliceInfoPlugin

CURA-4525 solved merge conflicts

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

SolidView

Render support meshes with a vertical stripe...

2018-01-05 18:33:05 +01:00

UltimakerMachineActions

Fixed the firmware update for USB print

2017-12-19 15:59:21 +01:00

UM3NetworkPrinting

Removed wrong comment

2018-01-10 16:29:36 +01:00

USBPrinting

Fix conflicts

2018-01-11 09:06:59 +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