Ghostkeeper 7df4c01814 Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: cura/Settings/MachineManager.py -> rowCount vs. count resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten. resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed. resources/qml/Toolbar.qml -> Git was wrong, not a conflict. resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.		2018-12-03 11:45:05 +01:00
..
__init__.py	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
ContainerManager.py	Fix URL in error message	2018-11-12 12:50:18 +01:00
cura_empty_instance_containers.py	Move constant instance containers to a separate file	2018-08-15 11:04:09 +02:00
CuraContainerRegistry.py	Fix typing issues	2018-11-12 12:48:49 +01:00
CuraContainerStack.py	Add unit test for addDefaultMachineActions()	2018-10-23 08:49:23 +02:00
CuraFormulaFunctions.py	Catch an error getting an extruder value before extruders are added to the global stack	2018-11-14 14:21:39 +01:00
CuraStackBuilder.py	Remove some duplicate addExtruder() and setNextStack() calls	2018-10-25 11:42:47 +02:00
Exceptions.py	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
ExtruderManager.py	Use public activeExtruderIndex rather than internal _activeExtruderIndex	2018-11-30 11:13:04 +01:00
ExtrudersModel.py	Use ListModel.count instead of rowCount	2018-12-03 11:13:26 +01:00
ExtruderStack.py	Remove unnecessary extra setMetaDataEntry	2018-11-30 11:11:17 +01:00
GlobalStack.py	Simplify code	2018-09-28 13:09:59 +02:00
MachineManager.py	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-12-03 11:45:05 +01: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	Fix code-style	2018-07-03 12:06:06 +02:00
SetObjectExtruderOperation.py	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
SettingInheritanceManager.py	Update typing and fixed the bug it exposes.	2018-10-16 11:31:33 +02:00
SettingOverrideDecorator.py	Only use setMetaDataEntry()	2018-07-11 11:14:57 +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	Don't unnecessarily cast to a set	2018-06-15 13:07:55 +02:00
UserChangesModel.py	Rename to CuraFormulaFunctions	2018-10-01 11:24:34 +02:00