Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict"" ...

This reverts commit 4bffa6d90f2e6e9784c7e5508b61e00a92ecb74f.

2018-12-07 10:25:46 +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

Make extension menu items translatable

2018-11-15 09:38:14 +01:00

CuraEngineBackend

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01: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

Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value.

2018-11-26 17:55:25 +01: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

Revert "Fix running tests in plugin using pytest"

2018-11-19 15:10:35 +01:00

MachineSettingsAction

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

ModelChecker

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

MonitorStage

Added MachineSelector to monitor menu

2018-11-30 13:58:44 +01:00

PerObjectSettingsTool

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

PostProcessingPlugin

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

PrepareStage

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

PreviewStage

Separate the view selector into a different file.

2018-11-25 18:24:21 +01:00

RemovableDriveOutputDevice

Remove unnecessary import and declaration of i18n in plugins

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

SimulationView

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +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

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +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

Revert "Revert "fix merge conflict""

2018-12-07 10:25:46 +01:00

USBPrinting

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

2018-12-04 15:08:50 +01:00

UserAgreement

Fix code style

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

VersionUpgrade

Added an extra import module, did not pass coding style test

2018-11-22 11:36:32 +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

__init__.py

CloudOutputDevice scaffolding

2018-11-19 20:08:05 +01:00