Ghostkeeper 8202b62343

Merge branch '3.4'

2018-06-07 11:38:13 +02:00

..

3MFReader

Merge branch '3.4'

2018-06-07 11:38:13 +02:00

3MFWriter

CURA-5164 The Preferences is not a singleton class anymore since in some point

2018-05-11 08:50:42 +02:00

ChangeLogPlugin

Fix merge conflicts from 3.4

2018-06-05 09:02:52 +02:00

CuraEngineBackend

CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle.

2018-06-07 11:35:09 +02:00

CuraProfileReader

Merge master into material marketplace

2018-05-01 11:56:34 +02:00

CuraProfileWriter

Create module cura.ReaderWriters

2018-04-05 15:14:15 +02:00

FirmwareUpdateChecker

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

2018-05-31 13:47:27 +02:00

GCodeGzReader

CURA-5164 Make the mesh readers compliant with the new signature of the mesh reader. Also adapt the tests.

2018-05-23 17:17:41 +02:00

GCodeGzWriter

Use gcode.gz as extension for GzWriter

2018-05-23 15:48:30 +02:00

GCodeProfileReader

Merge master into material marketplace

2018-05-01 11:56:34 +02:00

GCodeReader

CURA-5164 Make the mesh readers compliant with the new signature of the mesh reader. Also adapt the tests.

2018-05-23 17:17:41 +02:00

GCodeWriter

Fix check for existence of gcode_dict variable

2018-05-08 10:44:19 +02:00

ImageReader

CURA-5164 Make the mesh readers compliant with the new signature of the mesh reader. Also adapt the tests.

2018-05-23 17:17:41 +02:00

LegacyProfileReader

Create module cura.ReaderWriters

2018-04-05 15:14:15 +02:00

MachineSettingsAction

Cura-5296 Use separate packages.json files in app and user data

2018-05-08 11:54:19 +02:00

ModelChecker

Textual fix for Marketing

2018-05-28 15:27:22 +02:00

MonitorStage

Small codestyle changes after merge

2018-05-24 10:39:37 +02:00

PerObjectSettingsTool

CURA-5164 The Preferences is not a singleton class anymore since in some point

2018-05-11 08:50:42 +02:00

PostProcessingPlugin

Codestyle changes after merge

2018-05-24 10:58:55 +02:00

PrepareStage

Small codestyle changes after merge

2018-05-24 10:39:37 +02:00

RemovableDriveOutputDevice

Choose correct stream depending on output mode

2018-03-16 14:54:56 +01:00

SimulationView

Remove vestigial references to "monitoringPrint"

2018-06-06 11:22:35 +02:00

SliceInfoPlugin

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

2018-05-31 13:47:27 +02:00

SolidView

CURA-5164 The Preferences is not a singleton class anymore since in some point

2018-05-11 08:50:42 +02:00

SupportEraser

Fix translation of Support Blocker plug-in name

2018-04-23 14:15:23 +02:00

Toolbox

CURA-5402 hopefully solved merge conflicts

2018-06-06 14:39:53 +02:00

UFPWriter

Added MimeTypeDatabase for UFP extension

2018-05-08 10:59:05 +02:00

UltimakerMachineActions

Cura-5296 Use separate packages.json files in app and user data

2018-05-08 11:54:19 +02:00

UM3NetworkPrinting

Merge branch '3.4'

2018-06-07 09:34:30 +02:00

USBPrinting

Merge branch 'master' into WIP_improve_initialization

2018-05-28 13:37:26 +02:00

UserAgreement

Simplify UserAgreement

2018-05-31 14:29:56 +02:00

VersionUpgrade

Fix 21to22 upgrade

2018-06-04 15:18:33 +02:00

X3DReader

CURA-5164 Make the mesh readers compliant with the new signature of the mesh reader. Also adapt the tests.

2018-05-23 17:17:41 +02:00

XmlMaterialProfile

Fix a crash in MaterialManager when the brand of the material is None.

2018-06-07 10:54:23 +02:00

XRayView

GLES shader fixes

2018-03-29 21:07:51 +02:00