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