Ghostkeeper b5d8c1af6f Merge branch 'master' into fieldOfView-feature_firmware_updater ... Conflicts: cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved. plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes. plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.		2018-10-15 16:52:22 +02:00
..
__init__.py	Added first stubs for printer output models	2017-11-17 15:05:08 +01:00
ConfigurationModel.py	Fixed typo	2018-09-27 15:42:12 +02:00
ExtruderConfigurationModel.py	Add typings and fix code style	2018-09-06 16:57:45 +02:00
ExtruderOutputModel.py	Add typings and fix code style	2018-09-06 16:57:45 +02:00
FirmwareUpdater.py	Move updateFirmware to PrinterOutputDevice...	2018-10-09 16:26:45 +02:00
GenericOutputController.py	Move updateFirmware to PrinterOutputDevice...	2018-10-09 16:26:45 +02:00
MaterialOutputModel.py	LegacyUM3 now handles warnings & errors again	2017-11-23 13:37:59 +01:00
NetworkCamera.py	Camera delete now triggers the correct function	2018-01-03 13:44:38 +01:00
NetworkedPrinterOutputDevice.py	Remove code duplication for recreate network timer	2018-10-12 11:09:46 +02:00
PrinterOutputController.py	Fix incorrect typing and issues caused by typing	2018-09-28 13:40:39 +02:00
PrinterOutputModel.py	Merge branch 'master' into fieldOfView-feature_firmware_updater	2018-10-15 16:52:22 +02:00
PrintJobOutputModel.py	Move updateFirmware to PrinterOutputDevice...	2018-10-09 16:26:45 +02:00