Lipu Fei 6b0095014a Fix merge conflicts from master

2018-02-28 12:52:45 +01:00

..

__init__.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ContainerManager.py

Move getMachineDefinitionIDForQualitySearch() into QualityManager.py

2018-02-28 11:48:20 +01:00

CuraContainerRegistry.py

Move getMachineDefinitionIDForQualitySearch() into QualityManager.py

2018-02-28 11:48:20 +01:00

CuraContainerStack.py

WIP: Remove findDefault..()s

2018-02-16 14:23:11 +01:00

CuraStackBuilder.py

Use getters to get managers for CuraStackBuilder

2018-02-27 16:12:28 +01:00

Exceptions.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ExtruderManager.py

CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack

2018-02-27 13:03:08 +01:00

ExtrudersModel.py

Merge branch 'master' into feature_local_container_server

2017-12-08 16:03:05 +01:00

ExtruderStack.py

CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack

2018-02-27 13:03:08 +01:00

GlobalStack.py

CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack

2018-02-27 13:03:08 +01:00

MachineManager.py

Fix merge conflicts from master

2018-02-28 12:52:45 +01:00

MachineNameValidator.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

MaterialSettingsVisibilityHandler.py

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

2018-02-21 14:05:19 +01:00

PerObjectContainerStack.py

Import Application instead of inline import CuraApplication

2017-08-28 14:35:36 +02:00

SetObjectExtruderOperation.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

SettingInheritanceManager.py

Merge pull request #2685 from Ultimaker/container_stack_improvements

2017-11-20 17:42:26 +01:00

SettingOverrideDecorator.py

deepcopy value from the stack

2017-12-21 09:27:53 +01:00

SimpleModeSettingsManager.py

Update simple mode manager states when manager is created - CURA-4466

2017-10-20 12:37:59 +02:00

UserChangesModel.py

Fix retrieving setting values with "extruderValues()" and "resolveOrValue()"

2017-10-11 11:05:01 +02:00