1417 Commits

Author SHA1 Message Date
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
ChrisTerBeke
669fb39f40 Catch type errors when trying to populate models from API response 2019-09-09 10:44:17 +02:00
Ian Paschal
f517beba76
Fix typo
CS-171
2019-09-06 16:04:03 +02:00
Ian Paschal
e0194d8721
Extend found_machine_type_identifiers to include R2
CS-171
2019-09-06 16:03:48 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00:00
Chris ter Beke
7ff7ab53bf
Merge pull request #6313 from Ultimaker/CS-171_add_r2_support
CS-171 Add R2 support
2019-09-06 11:53:55 +02:00
Ian Paschal
f49cf8dfd5 Fix typo
CS-171
2019-09-06 11:30:42 +02:00
Ian Paschal
7674905f1c Extend found_machine_type_identifiers to include R2
CS-171
2019-09-06 11:23:28 +02:00
ChrisTerBeke
5f480f753c Add fixme note to hardcoded extruder count 2019-09-06 09:50:15 +02:00
ChrisTerBeke
549b724a4f Use 2 extruders at all times for now 2019-09-06 09:37:43 +02:00
ChrisTerBeke
ab3f627177 Check if printerConfiguration is actually set before trying to access it 2019-09-05 18:01:04 +02:00
ChrisTerBeke
210843a7bb Improve adding/connecting to output devices 2019-09-05 10:47:15 +02:00
ChrisTerBeke
4364d94423 Reduce logging and network activity during print job upload 2019-09-04 18:54:53 +02:00
ChrisTerBeke
ed616789cb
Remove debug print statement 2019-09-03 21:22:13 +02:00
ChrisTerBeke
86d87acd5b
Filter out configurations for empty materials 2019-09-03 21:21:06 +02:00
Jaime van Kessel
f7d61e1e24 Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-29 16:31:44 +02:00
ChrisTerBeke
13e85362b0 Fix typing issues 2019-08-28 23:27:30 +02:00
ChrisTerBeke
7b45100dd0 Ensure we're showing configurations when no available configurations in other extruder 2019-08-28 23:19:23 +02:00
ChrisTerBeke
189d873fc1 Fix typing issue 2019-08-28 22:45:18 +02:00
ChrisTerBeke
5ee6cd7e8f Better handling of error response, not always show message 2019-08-28 22:39:25 +02:00
ChrisTerBeke
47237cda5f Fix syncing materials via API, show nice message 2019-08-28 22:17:39 +02:00
Lipu Fei
6591593f59 Fix materials API call 2019-08-28 15:31:52 +02:00
Ian Paschal
830078b9d5 Add Ultimaker S3 image
Contributes to CS-190
2019-08-28 10:51:40 +02:00
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
9122d0cca4
Remove misleading text that says you could enter hostnames
We don't resolve the hostnames ever. You can only enter IP addresses.
2019-08-21 09:56:32 +02:00
Remco Burema
5039d8db05 Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-08-20 13:53:12 +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
7ed8d0b2f7 Remove deprecated .getMetadata() call.
part of CURA-6600
2019-08-16 09:37:58 +02:00
ChrisTerBeke
60758093f1
Determine skeleton loading properly 2019-08-15 21:29:20 +02:00
ChrisTerBeke
75f52c5a24
Bring back skeleton loading for monitor stage 2019-08-15 21:25:56 +02:00
ChrisTerBeke
7e9662e30e
Fix monitor tab UI not updating for cloud device due to overridden signals 2019-08-15 20:25:59 +02:00
ChrisTerBeke
9e6e9a4beb
Enable force override print job in local network, fix override button not enabled on older firmwares 2019-08-15 20:16:55 +02:00
ChrisTerBeke
de3f82610a
Add tooltips for firmware update back, fix print job override state 2019-08-15 19:42:25 +02:00
ChrisTerBeke
36f6bdca18 Bring cast back to fix typing 2019-08-15 14:36:25 +02:00
ChrisTerBeke
6833323845 UM3PrinterAction - refactor to property, remove discovery start from reset 2019-08-15 14:30:11 +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
e6d30516aa Fix status interval check for cloud devices 2019-08-14 14:21:16 +02:00
ChrisTerBeke
fcd5a563e4 Use cluster_size property from zeroconf if available 2019-08-13 21:42:44 +02:00
ChrisTerBeke
998f58d3fa Tweak offline check interval for cloud device 2019-08-13 15:19:30 +02:00
ChrisTerBeke
33876e9ca9 Set group_name correct with cloud devices, possibly fixes CS-225 2019-08-13 13:01:47 +02:00
ChrisTerBeke
2a9be0cdfe Only create API client when actually used 2019-08-13 12:55:54 +02:00
ChrisTerBeke
445fb59c12
Fix setting connection state after re-connect, don't re-register output device 2019-08-12 23:22:16 +02:00
ChrisTerBeke
2ed3af5989
Fix removing output device when signing out 2019-08-12 22:59:43 +02:00
ChrisTerBeke
27905a02a9
Fix re-connecting after network comes back 2019-08-12 21:47:15 +02:00
ChrisTerBeke
945e5f08a3
Fix checking if still connected or not 2019-08-12 20:08:57 +02:00