ChrisTerBeke 39218b910b

Merge branch 'master' into feature_custom_gcode_commands ...

* master:
  Two more fixes for typo in USBPrinterOutputController

2018-01-25 22:48:02 +01:00

..

3MFReader

CURA-4854 Revert some changes in 619a8cc that make that issue not working

2018-01-23 12:13:26 +01:00

3MFWriter

Don't write Octoprint keys to workspace projects

2018-01-22 15:37:51 +01:00

AutoSave

Revert "Fix: Cura update setting after delay"

2018-01-15 16:15:36 +01:00

ChangeLogPlugin

Correct description of SOLIDWORKS macro

2017-12-06 00:53:43 +01:00

CuraEngineBackend

Merge branch '3.2'

2018-01-22 12:58:16 +01:00

CuraProfileReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

CuraProfileWriter

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

FirmwareUpdateChecker

Finally remove annoying firmware check log line for non-UM3 printers

2018-01-19 10:42:04 +01:00

GCodeProfileReader

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

GCodeReader

CURA-4778 Add up to 8 different colors when loading a GCode, since we

2018-01-09 10:42:03 +01:00

GCodeWriter

CURA-4829 Do not save the quality changes profile in the GCode if the

2018-01-19 10:34:04 +01:00

ImageReader

CURA-4525 cleanups and change comment and added new-lines

2018-01-03 15:41:08 +01:00

LegacyProfileReader

Use unique name too if importing multiple legacy profiles

2017-12-19 17:36:20 +01:00

MachineSettingsAction

Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835

2018-01-22 17:18:09 +01:00

MonitorStage

Fix conflicts

2018-01-11 09:06:59 +01:00

PerObjectSettingsTool

Merge pull request #3089 from fieldOfView/feature_support_mesh_enhancements

2018-01-10 11:58:22 +01:00

PluginBrowser

Update plugin browser version to 4 as network rewrite has another set of breaking changes

2018-01-24 13:30:08 +01:00

PostProcessingPlugin

Check if scene has gcode_dict attribute before trying to get it

2018-01-15 09:18:57 +01:00

PrepareStage

Fix sidebar loading and unloading depending on active stage

2017-12-06 17:46:18 +01:00

RemovableDriveOutputDevice

Add stderr to send errors to

2017-11-14 11:53:24 +01:00

SimulationView

CURA-4853 evaluate layer view compatibility mode in init, therefore not binding some signals and fixing the bug

2018-01-23 11:46:59 +01:00

SliceInfoPlugin

Fix checking material_used per extruder for analytics - CURA-4858

2018-01-24 14:02:44 +01:00

SolidView

Render support meshes with a vertical stripe...

2018-01-05 18:33:05 +01:00

UCPWriter

Added very rough implementation for UCP files

2018-01-25 17:14:32 +01:00

UltimakerMachineActions

Fixed the firmware update for USB print

2017-12-19 15:59:21 +01:00

UM3NetworkPrinting

Failed state in printjobs is now handled correctly

2018-01-22 15:47:37 +01:00

USBPrinting

Merge branch 'master' into feature_custom_gcode_commands

2018-01-25 22:48:02 +01:00

UserAgreementPlugin

Merge branch '3.1'

2017-11-30 16:57:01 +01:00

VersionUpgrade

Fix version upgrade 30 to 31

2018-01-02 10:47:21 +01:00

X3DReader

CURA-4525 cleanups and change comment and added new-lines

2018-01-03 15:41:08 +01:00

XmlMaterialProfile

Remove overzealous log entry

2018-01-23 15:45:12 +01:00

XRayView

Add fix and doc for Mac OpenGL crash

2017-12-21 15:43:35 +01:00