Merge branch 'thopiekar-RemovableDrivePlugin-cleanup'

This commit is contained in:
Ghostkeeper 2017-10-04 14:55:36 +02:00
commit 0fab6fcc21
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -1,15 +1,19 @@
# Copyright (c) 2015 Ultimaker B.V.
# Uranium is released under the terms of the LGPLv3 or higher.
# Python build-ins
import threading
import time
# Uranium/Messaging
from UM.Message import Message
from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
from UM.Logger import Logger
# Uranium/IO
from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
from . import RemovableDriveOutputDevice
from UM.Logger import Logger
# Uranium/l18n
from UM.i18n import i18nCatalog
catalog = i18nCatalog("cura")