Jack Ha 1d4b2eac4b CURA-5048 solved merge conflict

2018-03-14 09:03:17 +01:00

..

3MFReader

Fix project loading for version upgrade

2018-03-09 19:35:23 +01:00

3MFWriter

Optimize 3MF writer and XML material serialization

2018-03-06 17:05:58 +01:00

AutoSave

CURA-4895 Connect timer signal just if CuraApplication has been previously created and started

2018-02-05 11:28:17 +01:00

ChangeLogPlugin

Revert "Fix rounded values in qml files"

2018-02-15 14:58:58 +01:00

CuraEngineBackend

Split error checking into smaller sub-tasks

2018-03-13 13:21:44 +01:00

CuraProfileReader

Minor fixes

2018-01-29 14:50:07 +01:00

CuraProfileWriter

Changing AGPLv3 to LGPLv3

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

FirmwareUpdateChecker

Add tags to urls

2018-02-14 15:15:02 +01:00

GCodeProfileReader

Better info on no profiles to import for gcode

2018-03-09 16:40:57 +01:00

GCodeReader

WIP: Refactor BuildPlateModel and split MultiBuildPlateModel

2018-02-17 22:24:05 +01:00

GCodeWriter

Merge remote-tracking branch 'origin/master' into refactoring_machine_manager

2018-02-22 16:53:32 +01:00

ImageReader

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

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

LegacyProfileReader

Fix legacy profile importing for CFP

2018-01-30 09:49:31 +01:00

MachineSettingsAction

CURA-5048 fixed nozzle dependent settings to update after setting machine nozzle diameter in a crude way

2018-03-13 17:29:20 +01:00

MonitorStage

CURA-4870 Remove Monitor stage status icons

2018-03-12 10:45:49 +01:00

PerObjectSettingsTool

Removed related commits to Settins per Object validation and

2018-03-06 15:40:26 +01:00

PluginBrowser

CURA-4935 Can't disable sending anonymous slice data and checking updates

2018-02-13 15:50:29 +01:00

PostProcessingPlugin

Get scripts from either Resources or Preferences

2018-03-12 09:48:03 +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

WIP: Refactor BuildPlateModel and split MultiBuildPlateModel

2018-02-17 22:24:05 +01:00

SliceInfoPlugin

Fix checking material_used per extruder for analytics - CURA-4858

2018-01-24 14:02:44 +01:00

SolidView

CURA-4400 Bugfix do not handle layer scene nodes in solidview

2018-03-06 17:01:30 +01:00

SupportEraser

Merge branch 'master' into refactoring_machine_manager

2018-02-27 10:24:56 +01:00

UFPWriter

Gracefully handle missing libCharon

2018-02-05 18:30:25 +01:00

UltimakerMachineActions

Call moveHead and moveBed on the printer model

2018-03-08 15:29:48 +01:00

UM3NetworkPrinting

Merge branch 'master' into feature_sync_button

2018-03-13 13:54:22 +01:00

USBPrinting

Catch timeout exceptions when printing via USB

2018-03-07 11:30:36 +01:00

UserAgreementPlugin

Change Math.floor to Math.round as a last try to fix garbled fonts

2018-02-14 09:28:47 +01:00

VersionUpgrade

Align for readability

2018-03-12 09:38:20 +01:00

X3DReader

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

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

XmlMaterialProfile

Fix material serialization

2018-03-13 16:37:04 +01:00

XRayView

Fix checking whether to render objects in X-ray pass

2018-03-06 15:53:34 +01:00