Jack Ha 42d939b34e Solved merge conflict. CURA-3321

2017-03-07 10:34:53 +01:00

..

3MFReader

Merge branch '3mf_speedup'

2017-03-06 17:03:42 +01:00

3MFWriter

Merge branch '3mf_speedup'

2017-03-06 17:03:42 +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

Not to trigger reslice happy anymore, only retrigger if necessary. Also using isSliceable instead of property check when inspecting root node. CURA-3413 CURA-3412

2017-03-02 16:38:31 +01:00

CuraProfileReader

Fixed a bunch of error which were reported by PyCharm's code analysis.

2017-02-26 21:05:09 +01: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

Solved merge conflict. CURA-3321

2017-03-07 10:34:53 +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 remote-tracking branch 'upstream/master' into mb-infill-line-angles

2017-02-15 08:20:45 +00:00

RemovableDriveOutputDevice

Fixed a bunch of error which were reported by PyCharm's code analysis.

2017-02-26 21:05:09 +01:00

SliceInfoPlugin

SliceInfo now only sends sliceable model hashes (layer data was also sent)

2017-03-02 16:44:40 +01:00

SolidView

Merge branch 'master' into python_type_hinting

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

UltimakerMachineActions

Fix selecting heated bed for UMO

2017-03-01 09:47:30 +01:00

UM3NetworkPrinting

Heated bed timeout time now hides correctly if time ran out

2017-03-06 14:41:33 +01:00

USBPrinting

Clarified unable to print over USB message for ulti-gcode

2017-02-22 09:43:24 +01:00

VersionUpgrade

Fixed a bunch of error which were reported by PyCharm's code analysis.

2017-02-26 21:05:09 +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