Lipu Fei 94e89ad4ac Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

..

__init__.py

Changing AGPLv3 to LGPLv3

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

ContainerManager.py

Remove unused imports to MaterialManager

2019-09-20 09:57:35 +02:00

cura_empty_instance_containers.py

Give empty material the required material properties

2019-09-13 16:07:33 +02:00

CuraContainerRegistry.py

Fix exporting with new quality changes groups

2019-09-12 13:40:47 +02:00

CuraContainerStack.py

Revert "Make 3MF-reader aware of setting-version for introduction Intent."

2019-09-20 11:56:08 +02:00

CuraFormulaFunctions.py

Remove use of deprecated extruders property

2019-09-13 17:27:16 +02:00

CuraStackBuilder.py

Add a function to add a MachineNode to the tree.

2019-09-23 13:18:11 +02:00

Exceptions.py

Changing AGPLv3 to LGPLv3

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

ExtruderManager.py

Remove use of deprecated extruders property

2019-09-13 17:27:16 +02:00

ExtruderStack.py

Remove use of deprecated extruders property

2019-09-13 17:27:16 +02:00

GlobalStack.py

Merge branch '4.3'

2019-09-12 12:04:01 +02:00

IntentManager.py

Also ensure that the container tree is used when selecting an intent

2019-09-24 13:17:36 +02:00

MachineManager.py

Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

MachineNameValidator.py

Remove unused parameter

2018-09-14 17:00:55 +02:00

MaterialSettingsVisibilityHandler.py

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

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

PerObjectContainerStack.py

Ensure that PerObjectContainer stack doesn't trigger a save

2019-09-06 11:16:12 +02:00

SetObjectExtruderOperation.py

Changing AGPLv3 to LGPLv3

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

SettingInheritanceManager.py

Revert "Prevent some unneeded calling of signals"

2018-12-24 09:37:17 +01:00

SettingOverrideDecorator.py

Calculate bounding box for helper meshes

2019-05-24 10:49:35 +02:00

SettingVisibilityPreset.py

Forbid interpolation in setting visibility preset files

2018-10-18 14:54:20 +02:00

SidebarCustomMenuItemsModel.py

Fix icon name role

2018-09-17 10:51:56 +02:00

SimpleModeSettingsManager.py

Remove use of deprecated extruders property

2019-09-13 17:27:16 +02:00