Commit graph

22 commits

Author SHA1 Message Date
Jaime van Kessel
d1a8ce54a1 Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-27 14:18:41 +02:00
ChrisTerBeke
c491d7f3e2 Some reformatting 2019-08-23 10:40:17 +02:00
ChrisTerBeke
d674494cdb Don't look at available configurations when no slots are available 2019-08-23 10:10:44 +02:00
ChrisTerBeke
3578afd4ac
Add support for multiple available configurations via network and cloud 2019-08-22 23:47:07 +02:00
Ghostkeeper
dcf7ed9969
Fix finding materials by GUID
See, I made the mistake again.

Contributes to issue CURA-6600.
2019-08-19 16:38:59 +02:00
Ghostkeeper
443495973f
Don't use deprecated material manager any more
Contributes to issue CURA-6600.
2019-08-19 16:16:28 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container
part of CURA-6600
2019-08-15 13:40:08 +02:00
ChrisTerBeke
eb5e1904ab Fix setting printer type on print job 2019-08-15 13:21:10 +02:00
ChrisTerBeke
c52974afb9 Fix possible property access on NoneType 2019-08-09 13:12:08 +02:00
ChrisTerBeke
ac177659e5
Fixes for add by IP 2019-08-06 21:46:37 +02:00
ChrisTerBeke
0ba8bf13e1 Fix copyright year to 2019 2019-08-02 15:09:37 +02:00
ChrisTerBeke
52a5a43fe2
Show cloud connection flow message when adding local network device 2019-07-30 22:44:45 +02:00
ChrisTerBeke
c1b5cce064 Fix string formatting 2019-07-30 18:04:16 +02:00
ChrisTerBeke
69102643b7 Bring back print job preview images 2019-07-30 16:55:35 +02:00
ChrisTerBeke
cf1dff3fdc Fix camera stream 2019-07-30 15:51:56 +02:00
ChrisTerBeke
64c7b2e737 Remove some TODOs 2019-07-30 15:32:34 +02:00
ChrisTerBeke
1ec2ac4118 some cleanup 2019-07-30 15:20:59 +02:00
ChrisTerBeke
fa5b083b74 Small code improvements 2019-07-29 21:58:29 +02:00
ChrisTerBeke
5b206496d0 Formatting new line 2019-07-29 17:41:27 +02:00
ChrisTerBeke
ddd282eef3 Remove absolute plugin imports, some fixes 2019-07-29 16:11:01 +02:00
ChrisTerBeke
4b212d6c05 Merge more stuff, re-use models for local networking as well 2019-07-29 14:53:50 +02:00
ChrisTerBeke
3c1b377308 Restructure codebase - part 1 2019-07-26 15:07:52 +02:00