Lipu Fei f94344263b Fix merge conflicts

2019-04-09 11:33:07 +02:00

..

3MFReader

Fix typo

2019-04-05 10:49:36 +02:00

3MFWriter

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

ChangeLogPlugin

Load change log from file for on-boarding page

2019-03-26 15:49:40 +01:00

CuraDrive

Merge pull request #5363 from Ultimaker/backup-list-response-error-handling

2019-02-26 11:16:40 +01:00

CuraEngineBackend

Move models around again

2019-03-26 08:29:22 +01:00

CuraProfileReader

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

CuraProfileWriter

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

FirmwareUpdateChecker

Merge remote-tracking branch 'origin/4.0'

2019-01-31 08:47:01 +01:00

FirmwareUpdater

Prevent crash when activePrinter doesn't have a controller

2019-01-31 12:59:29 +01:00

GCodeGzReader

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

GCodeGzWriter

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

GCodeProfileReader

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

GCodeReader

Add the skeleton of the plugin

2019-03-08 21:57:07 +01:00

GCodeWriter

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

ImageReader

fix color inversion and make variable naming descriptive

2019-03-22 11:42:31 +01:00

LegacyProfileReader

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

MachineSettingsAction

Adjust printer setup page for Mac

2019-04-08 14:49:55 +02:00

ModelChecker

Ensure the model checker doesn't update a gazillion times on multiply

2019-02-21 21:09:49 +01:00

MonitorStage

Move CuraStage back to where plugins expect it.

2019-03-29 13:11:03 +01:00

PerObjectSettingsTool

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

PostProcessingPlugin

Merge branch 'patch-3' of https://github.com/adecastilho/Cura

2019-03-14 14:50:34 +01:00

PrepareStage

Move CuraStage back to where plugins expect it.

2019-03-29 13:11:03 +01:00

PreviewStage

Move CuraStage back to where plugins expect it.

2019-03-29 13:11:03 +01:00

RemovableDriveOutputDevice

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

SimulationView

Fix extruder enable/disable problem in color scheme

2019-04-05 10:43:09 +02:00

SliceInfoPlugin

New style more info dialog for SliceInfo

2019-04-08 14:34:35 +02:00

SolidView

Simplify the expensive call to the validation state

2019-02-19 15:42:51 +01:00

SupportEraser

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

Toolbox

Fix case where aborting a download would cause a crash

2019-04-08 17:32:43 +02:00

UFPReader

Change the comment of the UFP mimetype to the correct description

2019-03-21 14:32:27 +01:00

UFPWriter

Change the comment of the UFP mimetype to the correct description

2019-03-21 14:32:27 +01:00

UltimakerMachineActions

Fix incorrect reference in UM2UpgradeSelectionMachineAction

2019-04-05 09:09:00 +02:00

UM3NetworkPrinting

Merge remote-tracking branch 'origin/CURA-6057_fix_onboarding' into CURA-6447_fix_start_onboarding

2019-04-09 11:31:42 +02:00

USBPrinting

Added exception handling for serial write

2019-04-08 17:43:03 +02:00

VersionUpgrade

Move PrinterOutputDevice into cura.PrinterOutput module

2019-03-20 09:43:09 +01:00

X3DReader

Update plugin versions to match package versions

2018-12-17 13:03:21 +01:00

XmlMaterialProfile

Fix iterating over 'hardware compatible' keys

2019-03-05 15:25:39 +01:00

XRayView

Fix z-fighting on bottom layer of x-ray view

2019-01-05 00:03:48 +01:00