ChrisTerBeke
5f31551184
Fix checking for cases where machine creation failed
2019-10-01 19:41:02 +02:00
ChrisTerBeke
c3d846440d
Set some meta data before switching active stacks, fix manual added device pairing
2019-10-01 19:31:35 +02:00
Lipu Fei
96a9bcccbb
Merge remote-tracking branch 'origin/master' into feature_intent
2019-10-01 09:41:05 +02:00
ChrisTerBeke
99832c3a68
Use printer type name instead of id
2019-09-27 21:09:53 +02:00
ChrisTerBeke
9e54cc33ce
Move code
2019-09-27 20:50:46 +02:00
ChrisTerBeke
b18f9469bf
Select correct machine type connecting to output device
2019-09-27 20:39:57 +02:00
ChrisTerBeke
01e665a0d7
Partial revert of #6432 , actually fix refreshing configurations
2019-09-27 19:25:23 +02:00
ChrisTerBeke
93c1c88793
Only show cloud flow message when signed in and not cloud connected yet, fix machine configuration when using legacy network selection flow
2019-09-27 13:38:13 +02:00
Lipu Fei
94e89ad4ac
Fix merge conflicts with master
2019-09-24 14:26:43 +02:00
Ghostkeeper
05de920c21
Once more with feeling
...
Sorry, I didn't see the other review comment until after I pushed the previous commit.
Contributes to issue CURA-6600.
2019-09-18 14:28:22 +02:00
Ghostkeeper
a3e9316f48
Rename all_root_materials to all_base_files
...
This naming is more consistent with the naming of the metadata entry and most of the other code.
Contributes to issue CURA-6600.
2019-09-18 14:27:04 +02:00
ChrisTerBeke
5dfb8216df
Fix loading popup image on windows
2019-09-13 11:06:34 +02:00
ChrisTerBeke
e8b48a299b
Store in preferences if the user wants to hide the message
2019-09-13 10:45:42 +02:00
Diego Prado Gesto
bca68c6db0
Merge branch 'feature_intent' into feature_intent_container_tree
2019-09-13 09:02:51 +02:00
Ghostkeeper
b8ab04df4a
Correct type of logged item
2019-09-12 15:58:09 +02:00
Ghostkeeper
3a3aeb92a9
Log errors rather than printing them
...
This way we can debug them if a user sends us the logs.
2019-09-12 15:45:10 +02:00
Ghostkeeper
2d2bf9e279
Use logger for errors instead of printing them to stdout
...
This way they will show up in users' logs.
2019-09-12 15:25:01 +02:00
ChrisTerBeke
07672fd569
Show message when new cloud printers were added to your account but not in Cura yet
2019-09-12 11:04:05 +02:00
Ghostkeeper
f6089ed627
Don't use material manager to get list of materials to send
...
The material manager is no longer populated so it wouldn't send any materials any more.
This is probably faster anyway since it doesn't need to go back to the container registry for every file.
Contributes to issue CURA-6600.
2019-09-11 15:43:35 +02:00
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
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
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
