Merge remote-tracking branch 'origin/master' into WIP_onboarding

This commit is contained in:
Lipu Fei 2019-03-11 09:05:43 +01:00
commit 6b2642ee9a
59 changed files with 1272 additions and 101 deletions

View file

@ -357,7 +357,7 @@ class MachineManager(QObject):
# Make sure that the default machine actions for this machine have been added
self._application.getMachineActionManager().addDefaultMachineActions(global_stack)
ExtruderManager.getInstance()._fixSingleExtrusionMachineExtruderDefinition(global_stack)
ExtruderManager.getInstance().fixSingleExtrusionMachineExtruderDefinition(global_stack)
if not global_stack.isValid():
# Mark global stack as invalid
ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId())