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
Cura.proto	Basic cleanup	2018-08-20 07:40:28 -04:00
CuraEngineBackend.py	Merge branch 'master' into refactor_singleton_settingsbase	2018-09-13 11:52:13 +02:00
plugin.json	Increase plugin API version to 5	2018-08-27 13:59:00 +02:00
ProcessGCodeJob.py	WIP: Refactor BuildPlateModel and split MultiBuildPlateModel	2018-02-17 22:24:05 +01:00
ProcessSlicedLayersJob.py	Use public activeExtruderIndex rather than internal _activeExtruderIndex	2018-11-30 11:13:04 +01:00
StartSliceJob.py	Add key check before accessing in ƒStartSliceJob	2018-11-29 15:17:43 +01:00