 Ghostkeeper
|
51420c8311
Merge branch '4.0'
|
6 years ago |
|
Simon Edwards
|
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up
|
6 years ago |
|
Lipu Fei
|
e5071eac5b
Fix typing
|
6 years ago |
|
Lipu Fei
|
47d531e2c5
Fix typing
|
6 years ago |
|
Lipu Fei
|
6e40e4a831
Remove unused things
|
6 years ago |
|
Ian Paschal
|
01ca3546aa
Add activeMachineAddress to MachineManager for easy access
|
6 years ago |
|
Lipu Fei
|
fff6cb9ce8
Merge remote-tracking branch 'origin/4.0'
|
6 years ago |
|
Lipu Fei
|
bac344a692
Show extruder names in disabled message
|
6 years ago |
|
Ian Paschal
|
f2ddb2808f
Add firmware check
|
6 years ago |
|
Ghostkeeper
|
e7d2400199
Merge branch '4.0'
|
6 years ago |
|
Lipu Fei
|
f7765189c8
Show Extruder 1,2,3,... in message
|
6 years ago |
|
Jaime van Kessel
|
5600d5407c
Add default if group_name is not set.
|
6 years ago |
|
Jaime van Kessel
|
4aaeb8c2d5
Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0
|
6 years ago |
|
Lipu Fei
|
efa26c8323
Merge remote-tracking branch 'origin/4.0'
|
6 years ago |
|
Remco Burema
|
954fdb20ad
Rename 'connect_group_name' to 'group_name'. [CURA-6153]
|
6 years ago |
|
Simon Edwards
|
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states
|
6 years ago |
|
Remco Burema
|
6cd3a5fe3d
Show correct printer name in selector-header on disconnect. [CURA-6153]
|
6 years ago |
|
Lipu Fei
|
c73747ad44
Merge remote-tracking branch 'origin/4.0'
|
6 years ago |
|
Jaime van Kessel
|
3734b980d8
When disabling an extruder due to sync, always show a message.
|
6 years ago |
|
Ian Paschal
|
389bdeb0c7
Expose configurations the same way as connectivity
|
6 years ago |
|
Lipu Fei
|
4f6d53b009
Do not disable all extruders when syncing
|
6 years ago |
|
Lipu Fei
|
b70e9c9080
Handle empty hotend and material in config syncing
|
6 years ago |
|
Ghostkeeper
|
232498980c
Merge branch '4.0'
|
6 years ago |
|
Jaime van Kessel
|
3774fdbd02
Refactored the "connection_type" metadata entry so it can support multiple types.
|
6 years ago |
|
Jaime van Kessel
|
24fbb1007d
Merge branch '4.0' of github.com:Ultimaker/Cura
|
6 years ago |
|
ChrisTerBeke
|
36e49ee6bb
Make activeMachineIsGroup more robust
|
6 years ago |
|
ChrisTerBeke
|
a6114d39e4
Fix merge conflicts with 4.0
|
6 years ago |
|
Jaime van Kessel
|
2a4c66888e
Use getNumInstances instead of counting the number of instances in machinemanager
|
6 years ago |
|
Jaime van Kessel
|
0b0f674e4b
Remove unused code
|
6 years ago |
|
Jaime van Kessel
|
d9d1c93bd0
Use "NotConnected" as default for the connection state
|
6 years ago |
|
Jaime van Kessel
|
1277fbabc5
Fix connection type not always being seen correctly
|
6 years ago |
|
ChrisTerBeke
|
1012eb7553
Assure bool
|
6 years ago |
|
ChrisTerBeke
|
bbddbcde9a
cleanup
|
6 years ago |
|
ChrisTerBeke
|
af2061cd52
Simplify some checks for connection types and group size
|
6 years ago |
|
ChrisTerBeke
|
2f92f6ef50
Simplify checking if cloud or network printer, small fixes
|
6 years ago |
|
ChrisTerBeke
|
0edeb11a78
Merge branch '4.0' into STAR-322_cloud-connection
|
6 years ago |
|
Remco Burema
|
a9f4b70b5c
Emit 'number of extruders changed' signal after add machine. [CURA-6045]
|
6 years ago |
|
ChrisTerBeke
|
beb68213f4
Remove much logging or use debug level, fix cloud icon not appearing right away
|
6 years ago |
|
ChrisTerBeke
|
80d2a78463
Fix optional type for output device
|
6 years ago |
|
ChrisTerBeke
|
1b356a3219
Move cloud connection check logic to Python
|
6 years ago |
|
Lipu Fei
|
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types
|
6 years ago |
|
Jaime van Kessel
|
d4bb50886f
Merge branch 'CURA-6011_connection_types' of github.com:Ultimaker/Cura into CURA-6011_connection_types
|
6 years ago |
|
Jaime van Kessel
|
84a7f2e5a2
Fix review comments
|
6 years ago |
|
Lipu Fei
|
6017c2b4d2
Replace isProfileUserCreated with hasCustomQuality
|
6 years ago |
|
Diego Prado Gesto
|
b5d8db6a77
Merge branch '4.0' into CURA-6011_connection_types
|
6 years ago |
|
Jaime van Kessel
|
aad7540366
Fix situation where multiple connect configurations would cause issues
|
6 years ago |
|
Jaime van Kessel
|
ee74b9f89f
Once the connectiontype is recovered, it's converted to a string
|
6 years ago |
|
Jaime van Kessel
|
938287095f
Use connection type instead of um_network_key to see if a printer has a network connection
|
6 years ago |
|
Lipu Fei
|
df0b1c6c77
Fix ExtruderManager creation in MachineManager
|
6 years ago |
|
Diego Prado Gesto
|
15f81da95b
Do not show the layer height in the header panel when the profile is not supported
|
6 years ago |
