Cura/plugins/USBPrinting
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
..
avr_isp Set encoding correctly when opening files everywhere 2018-06-11 11:09:07 +02:00
__init__.py Fix code style and unused imports 2018-10-03 23:07:37 +02:00
AutoDetectBaudJob.py Fix opening port after baudrate detection 2018-09-14 14:06:55 +02:00
AvrFirmwareUpdater.py Catch the one that got away 2018-10-11 19:16:10 +02:00
plugin.json Increase plugin API version to 5 2018-08-27 13:59:00 +02:00
USBPrinterOutputDevice.py Merge branch 'master' into fieldOfView-feature_firmware_updater 2018-10-15 16:52:22 +02:00
USBPrinterOutputDeviceManager.py Factor out USBPrinterManager singleton 2018-08-22 15:44:11 +02:00