GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 23:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,394 Commits 289 Branches 260 Tags
Commit Graph

1234 Commits

Author SHA1 Message Date
ChrisTerBeke
0028ec6746 Ensure all property values are of type bytes 2019-04-18 14:22:05 +02:00
ChrisTerBeke
5bb56e06a4 Merge branch 'master' into cloud-cluster-discovery-mvp 2019-04-18 13:55:56 +02:00
Lipu Fei
98c4b7508f Fix typing 2019-04-18 06:32:52 +00:00
ChrisTerBeke
3cbd8a94a9
Add minimal support for discovering cloud printers outside of LAN 2019-04-18 00:19:12 +02:00
Ghostkeeper
cd89f7345a
Merge branch 'WIP_gitlab_ci' 2019-04-17 16:30:32 +02:00
Ian Paschal
17a5816b88 Fix typing 
Contributes to CL-1325
 2019-04-11 10:12:27 +02:00
Ian Paschal
61c38c5ec0 Pass output device (or not) to cloud check method 
Contributes to CL-1325
 2019-04-10 15:43:44 +02:00
Jaime van Kessel
c2b901ae47 Merge branch 'CURA-6057_fix_onboarding' of github.com:Ultimaker/Cura 2019-04-09 16:34:36 +02:00
Ian Paschal
2a7df3cedd Fix untranslated string 
Contributes to CL-1302
 2019-04-08 13:45:09 +02:00
Lipu Fei
086ae1c735 Make sure the unsuccessful manual device gets removed 
CURA-6057
 2019-04-08 12:27:32 +02:00
Jaime van Kessel
fe14024620 Move existNetworkInstances into discover action 2019-04-05 17:49:29 +02:00
Jaime van Kessel
5b818d203a Move a bunch of network only functions out of machine manager 
Machine manager is way to big as is, so we need to move more code out of it to
locations where the code is actually used.
 2019-04-05 17:45:19 +02:00
Lipu Fei
5074cf69dd Fix typing 
CURA-6435
 2019-04-05 09:57:58 +02:00
Jaime van Kessel
932a5c8fc9 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura 2019-04-04 14:38:18 +02:00
Simon Edwards
f933f2f271
Merge pull request #5478 from Ultimaker/CL-1267_selective_cloud_flow_metadata 
CL-1267 Don't hide Cloud flow message for wrong printer
 2019-04-03 17:09:57 +02:00
Lipu Fei
ffce5b8d58 FixassociateActiveMachineWithPrinterDevice() 
CURA-6057
 2019-04-03 12:10:09 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Ghostkeeper
df32f3e263
Move Cura.ProgressBar to Uranium 
It is not specific to 3D printing.

Contributes to issue CURA-6057.
 2019-04-03 11:51:57 +02:00
Lipu Fei
dd19d7d1a9 Fix typing 2019-04-03 08:25:17 +00:00
Simon Edwards
8700cbe4e8 Mypy fix 
CL-1266
 2019-04-01 15:22:38 +02:00
Simon Edwards
19c6fceb0c Delay using getPluginPath() until after start up time 
CL-1266
 2019-04-01 14:30:20 +02:00
Ian Paschal
feec1ffb56 Improve signals 
Contributes to CL-1267
 2019-04-01 12:17:01 +02:00
Remco Burema
dc8524b90d Fix 'DiscoverUM3Action' required attention from user in flow. [CURA-6057] 2019-03-29 16:23:16 +01:00
Ian Paschal
58f1c05564 Actually fix tests 
Contributes to CL-1266
 2019-03-29 12:27:58 +01:00
Jaime van Kessel
f8b67be487 Fix error spam when a printer of a cluster is unreachable 
CURA-6057
 2019-03-29 10:43:47 +01:00
Ian Paschal
4581c1f138 Fix UM3NetworkPrinting test 
Contributes to CL-1266
 2019-03-28 16:20:01 +01:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +01:00
Ian Paschal
49cb3de562 Merge remote-tracking branch 'origin/master' into CL-1266_cloud_association_for_manual_ips 2019-03-27 16:53:31 +01:00
Ian Paschal
637e18a841 Add default value for internal IP if not supplied 
Contributes to CL-1266
 2019-03-27 15:40:06 +01:00
Lipu Fei
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +01:00
Lipu Fei
4a171eebf6 Move models around again 
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
 2019-03-26 08:29:22 +01:00
Ian Paschal
fc650865d6 Improved cloud pop-up 
Contributes to CL-1287
 2019-03-22 15:24:12 +01:00
Ian Paschal
2233543780 Only set "do not show cloud message" metadata if active machine is the added cloud cluster 
Contributes to CL-1267
 2019-03-22 14:53:55 +01:00
Ian Paschal
9aef692082 Emit added or removed clusters 
Useful to whomever is listening in on those signals to know _what_ was added or removed.

Contributes to CL-1267
 2019-03-22 14:52:11 +01:00
Lipu Fei
ec0b197b6e Fix merge conflicts 2019-03-22 14:28:23 +01:00
Remco Burema
b25df557d3 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-22 13:20:43 +01:00
Lipu Fei
80dff49b8a Fix merge conflicts 2019-03-22 10:00:57 +01:00
Lipu Fei
f90fd8aee8 Add typing 2019-03-22 09:50:32 +01:00
Lipu Fei
b1620f1912 Fix typing 2019-03-22 09:49:40 +01:00
Remco Burema
8250c91fc4 Make remove manual device (also) work (as failure-state of add manual device). [CURA-6294] 2019-03-21 18:45:57 +01:00
Lipu Fei
11252ce0f7 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Remco Burema
139edbb0b7
Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip 
'WIP-onboarding-by-ip' into 'parent' branch
 2019-03-21 09:52:39 +01:00
Lipu Fei
aa1ad9a93d Fix merge conflicts 2019-03-21 09:31:24 +01:00
Lipu Fei
85a3b54111 Merge WIP_onboarding 2019-03-21 09:21:56 +01:00
Lipu Fei
cf5fd1c355 Fix typing 2019-03-21 09:13:00 +01:00
Lipu Fei
a17642a5a1 Merge WIP_onboarding_by_ip 2019-03-20 13:42:15 +01:00
Remco Burema
ad6603bab8 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-20 13:33:19 +01:00