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
..
tests	Add test for VersionUpgrade41to42	2019-06-03 16:22:54 +02:00
__init__.py	Stacks are upgraded to a higher version number	2019-06-19 13:14:02 +02:00
plugin.json	Add version upgrade for version 4.1 to 4.2	2019-06-11 17:44:04 +02:00
VersionUpgrade41to42.py	Merge branch 'master' into feature_intent	2019-08-13 14:43:28 +02:00