Jack Ha 057dc2fd7d Solved merge conflicts. CURA-3214

2017-02-21 11:01:20 +01:00

..

3MFReader

Refactor properties that start with 'get' to avoid confusion between slots & properties

2017-02-17 13:35:01 +01:00

3MFWriter

Small fix for a regression in the ThreeMFWriter from the recent type hint merge.

2017-02-16 10:20:44 +01:00

AutoSave

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

ChangeLogPlugin

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

2017-02-10 16:43:08 +01:00

CuraEngineBackend

Solved merge conflicts. CURA-3214

2017-02-21 11:01:20 +01:00

CuraProfileReader

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

CuraProfileWriter

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

GCodeProfileReader

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

GCodeReader

Fixed GCodeReader. CURA-3273

2017-02-09 15:27:53 +01:00

GCodeWriter

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

ImageReader

Replace "transparent" Rectangles by Items

2017-01-25 15:21:37 +01:00

LayerView

Travel moves are now flat planes, on top of the 'tubes'. CURA-3273

2017-02-21 10:00:29 +01:00

LegacyProfileReader

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

MachineSettingsAction

Merge branch 'master' into python_type_hinting

2017-01-17 08:42:55 +01:00

PerObjectSettingsTool

Merge branch 'master' into python_type_hinting

2017-01-17 08:42:55 +01:00

RemovableDriveOutputDevice

Fixes for all of the plugins. Added a script to invoke mypy. (I'm stiiiick of .bat files. They are just broken.)

2017-01-17 16:57:37 +01:00

SliceInfoPlugin

Fixes for all of the plugins. Added a script to invoke mypy. (I'm stiiiick of .bat files. They are just broken.)

2017-01-17 16:57:37 +01:00

SolidView

Merge branch 'master' into python_type_hinting

2017-01-27 15:37:30 +01:00

UltimakerMachineActions

Fix links to ContainerRegistry

2017-02-14 16:57:21 +01:00

UM3NetworkPrinting

Notify to update remaining time when it drastically changes

2017-02-16 12:58:39 +01:00

USBPrinting

Notify to update remaining time when it drastically changes

2017-02-16 12:58:39 +01:00

VersionUpgrade

Also check the upgrade plugins.

2017-01-17 20:56:28 +01:00

X3DReader

Fixes for all of the plugins. Added a script to invoke mypy. (I'm stiiiick of .bat files. They are just broken.)

2017-01-17 16:57:37 +01:00

XmlMaterialProfile

Fix link to ContainerRegistry

2017-02-14 17:00:33 +01:00

XRayView

Finishing up opengl 4.1 core profile things, it all works. CURA-3273

2017-02-02 17:08:20 +01:00