3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-26 09:01:01 +01:00
commit a85f2ce156
52 changed files with 202 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/MachineManager.py
View file

@ -23,8 +23,8 @@ from UM.Signal import postponeSignals, CompressTechnique
from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionType
from cura.UI.PrinterConfigurationModel import PrinterConfigurationModel
from cura.UI.ExtruderConfigurationModel import ExtruderConfigurationModel
from cura.PrinterOutput.Models.PrinterConfigurationModel import PrinterConfigurationModel
from cura.PrinterOutput.Models.ExtruderConfigurationModel import ExtruderConfigurationModel
from cura.UI.MaterialOutputModel import MaterialOutputModel
from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
from cura.Settings.ExtruderManager import ExtruderManager