Lipu Fei 9575c6b3b3 Fix merge conflicts

2019-04-01 13:28:42 +02:00

..

3MFReader

Fix the situation where an upgraded single extrusion machine and loading project caused issues

2019-02-28 16:17:34 +01: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

WIP: Cleanup MachineSettingsAction

2019-03-20 08:59:20 +01: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

Merge branch '4.0' of github.com:Ultimaker/Cura

2019-01-17 14:28:35 +01:00

SliceInfoPlugin

Remove old send slice-info confirm: part of the new onboard. [CURA-6057]

2019-03-29 09:33:41 +01: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 merge conflicts

2019-04-01 13:28:42 +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

Merge WIP_onboarding

2019-03-20 11:28:30 +01:00

UM3NetworkPrinting

Fix 'DiscoverUM3Action' required attention from user in flow. [CURA-6057]

2019-03-29 16:23:16 +01:00

USBPrinting

Move models around again

2019-03-26 08:29:22 +01: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