Merge branch '4.0' into CURA-6005_cura_drive_plugin

Remove unused file.

Contributes to CURA-6005.
This commit is contained in:
Diego Prado Gesto 2018-12-18 07:17:37 +01:00
commit 3c99b69724
66 changed files with 786 additions and 2383 deletions

View file

@ -129,6 +129,15 @@ if TYPE_CHECKING:
numpy.seterr(all = "ignore")
try:
from cura.CuraVersion import CuraAppDisplayName, CuraVersion, CuraBuildType, CuraDebugMode, CuraSDKVersion # type: ignore
except ImportError:
CuraAppDisplayName = "Ultimaker Cura"
CuraVersion = "master" # [CodeStyle: Reflecting imported value]
CuraBuildType = ""
CuraDebugMode = False
CuraSDKVersion = "6.0.0"
class CuraApplication(QtApplication):
# SettingVersion represents the set of settings available in the machine/extruder definitions.