Ghostkeeper 266e08fdff

Merge branch 'master' into ui_rework_4_0 ...

Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.

2018-11-13 16:23:36 +01:00

..

3MFReader

Fix quality changes lookup in project loading

2018-11-06 13:31:04 +01:00

3MFWriter

Remove unnecessary import and declaration of i18n in plugins

2018-10-03 22:00:24 +02:00

ChangeLogPlugin

Rename CC Red 0.6 to CC 0.6 in the Changelog.

2018-11-07 11:06:40 +01:00

CuraEngineBackend

Merge remote-tracking branch 'origin/3.5'

2018-10-09 12:04:53 +02:00

CuraProfileReader

Code style: Space around binary operators

2018-10-10 14:28:50 +02:00

CuraProfileWriter

Increase plugin API version to 5

2018-08-27 13:59:00 +02:00

FirmwareUpdateChecker

Change URL of firmware update page for Ultimaker 3 and S5

2018-10-15 15:12:42 +02:00

FirmwareUpdater

Fix code style

2018-10-18 14:30:33 +02:00

GCodeGzReader

Move MIME type declarations into constructors of readers

2018-09-27 13:58:06 +02:00

GCodeGzWriter

Increase plugin API version to 5

2018-08-27 13:59:00 +02:00

GCodeProfileReader

Increase plugin API version to 5

2018-08-27 13:59:00 +02:00

GCodeReader

Merge branch 'CURA-5769_gcode_retraction'

2018-10-24 16:14:05 +02:00

GCodeWriter

Improve warning when saving g-code before slicing

2018-09-28 12:01:20 +02:00

ImageReader

Fix code style

2018-10-18 14:30:33 +02:00

LegacyProfileReader

Code style: Space around binary operators

2018-10-10 14:28:50 +02:00

MachineSettingsAction

Fix extruder index for material diameter box in MachineSettings dialog

2018-10-29 10:40:25 +01:00

ModelChecker

Fix code style

2018-10-18 14:30:33 +02:00

MonitorStage

Add PreviewStagePlugin stubs

2018-10-29 11:28:08 +01:00

PerObjectSettingsTool

Disable per-meshgroup settings in the per-mesh settings when in one-at-a-time mode.

2018-10-26 11:01:46 +02:00

PostProcessingPlugin

Merge branch 'ui_rework_4_0' into cura4.0_header

2018-10-29 11:10:25 +01:00

PrepareStage

Set the Z of the machine selector so the tooltip doesn't get hidden

2018-11-02 13:37:57 +01:00

PreviewStage

Document PreviewStage.py

2018-11-02 15:11:49 +01:00

RemovableDriveOutputDevice

Remove unnecessary import and declaration of i18n in plugins

2018-10-03 22:00:24 +02:00

SimulationView

Make some tweaks in the UI for the preview stage.

2018-11-11 14:06:52 +01:00

SliceInfoPlugin

Remove unnecessary import and declaration of i18n in plugins

2018-10-03 22:00:24 +02:00

SolidView

Set SolidView to invisible.

2018-10-29 14:54:42 +01:00

SupportEraser

Increase plugin API version to 5

2018-08-27 13:59:00 +02:00

Toolbox

Merge branch 'master' into ui_rework_4_0

2018-11-13 16:23:36 +01:00

UFPWriter

[CURA-5775] The snaphot-creation of the UFP-writer should only be called when writing to UFP-files.

2018-10-04 15:54:22 +02:00

UltimakerMachineActions

Fix code style

2018-10-18 14:30:33 +02:00

UM3NetworkPrinting

Merge branch 'master' into ui_rework_4_0

2018-11-09 08:53:31 +01:00

USBPrinting

Make sure firmware name is only requested once

2018-10-19 14:38:25 +02:00

UserAgreement

Fix code style

2018-10-18 14:30:33 +02:00

VersionUpgrade

Add the quality folder to the version upgrade in order to update quality

2018-11-08 15:42:39 +01:00

X3DReader

Increase plugin API version to 5

2018-08-27 13:59:00 +02:00

XmlMaterialProfile

Remove unnecessary import and declaration of i18n in plugins

2018-10-03 22:00:24 +02:00

XRayView

Increase plugin API version to 5

2018-08-27 13:59:00 +02:00