Cura/cura/Settings
Ghostkeeper 20201c65e6
Merge branch 'master' into feature_intent
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
2019-08-13 14:43:28 +02:00
..
__init__.py Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ContainerManager.py Added missing typing 2019-08-02 15:16:29 +02:00
cura_empty_instance_containers.py Add a selector for the intent profile 2019-06-05 11:13:32 +02:00
CuraContainerRegistry.py Use regex literal instead of normal literal for regex 2019-08-08 09:46:21 +02:00
CuraContainerStack.py Remove override for version number in CuraContainerStack 2019-07-10 14:57:26 +02:00
CuraFormulaFunctions.py Return the value for default extruder if the requested one could not be found 2019-04-02 11:46:12 +02:00
CuraStackBuilder.py Add more info in exceptions 2019-08-02 11:12:16 +02:00
Exceptions.py Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ExtruderManager.py Add more info in exceptions 2019-08-02 11:12:16 +02:00
ExtruderStack.py Code style: Start comments with a space 2018-12-06 16:27:56 +01:00
GlobalStack.py Consistent naming, some bug fixes 2019-07-29 17:24:10 +02:00
IntentManager.py Rename function name and fix tests 2019-07-09 12:53:44 +02:00
MachineManager.py Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-26 12:47:13 +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 Spelling fix: Overriden -> Overridden 2019-04-04 14:39:01 +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 Replace isProfileUserCreated with hasCustomQuality 2018-12-18 08:56:56 +01:00