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
2019-07-16 11:24:19 +02:00
2018-12-17 13:03:21 +01:00
2019-04-30 11:39:45 +02:00
2019-04-23 09:07:19 +02:00
2019-07-26 12:47:13 +02:00
2019-07-24 10:55:38 +02:00
2018-12-17 13:03:21 +01:00
2019-06-03 09:17:35 +02:00
2019-01-31 12:59:29 +01:00
2018-12-17 13:03:21 +01:00
2018-12-17 13:03:21 +01:00
2018-12-17 13:03:21 +01:00
2019-05-06 14:33:24 +02:00
2018-12-17 13:03:21 +01:00
2019-03-22 11:42:31 +01:00
2018-12-17 13:03:21 +01:00
2019-06-06 09:44:42 +02:00
2019-02-21 21:09:49 +01:00
2019-07-09 09:09:08 +02:00
2019-08-02 14:34:14 +02:00
2019-08-01 11:06:22 +02:00
2019-04-25 21:50:24 +02:00
2019-04-25 22:42:52 +02:00
2018-12-17 13:03:21 +01:00
2019-07-23 13:40:40 +02:00
2019-08-13 12:59:27 +02:00
2019-04-23 10:31:13 +02:00
2019-05-24 10:49:35 +02:00
2019-07-24 09:53:51 +02:00
2019-04-30 13:03:17 +02:00
2019-03-21 14:32:27 +01:00
2019-04-17 09:18:08 +02:00
2019-08-12 23:22:16 +02:00
2019-07-22 09:34:00 +02:00
2019-08-13 14:43:28 +02:00
2018-12-17 13:03:21 +01:00
2019-07-23 12:58:46 +02:00
2019-05-16 14:22:05 +02:00
20201c65e6