GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 06:59:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,907 Commits 290 Branches 260 Tags
Commit Graph

6590 Commits

Author SHA1 Message Date
Lipu Fei
9a33a301ab Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding 2019-04-10 09:08:05 +02:00
Jaime van Kessel
9cc4665db8 Fix crash for when resetDownload is called after a long wait 
CURA-6448
 2019-04-09 17:10:18 +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
Lipu Fei
f94344263b Fix merge conflicts 2019-04-09 11:33:07 +02:00
Lipu Fei
738886b4fb Merge remote-tracking branch 'origin/CURA-6057_fix_onboarding' into CURA-6447_fix_start_onboarding 2019-04-09 11:31:42 +02:00
Jaime van Kessel
49a9561625 Added exception handling for serial write 2019-04-08 17:43:03 +02:00
Jaime van Kessel
2765122b95 Fix case where aborting a download would cause a crash 2019-04-08 17:32:43 +02:00
Lipu Fei
75e92aaa78 Adjust printer setup page for Mac 
CURA-6057
 2019-04-08 14:49:55 +02:00
Lipu Fei
3bf8a1f257 New style more info dialog for SliceInfo 
CURA-6057
 2019-04-08 14:34:35 +02:00
Ian Paschal
1ef98d029d Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-04-08 13:45:21 +02:00
Ian Paschal
2a7df3cedd Fix untranslated string 
Contributes to CL-1302
 2019-04-08 13:45:09 +02:00
Jaime van Kessel
cbfe10a748 Prevent a zeroDivision error from crashing the usb printing 
This fixes #5592
 2019-04-08 13:36:48 +02:00
Lipu Fei
086ae1c735 Make sure the unsuccessful manual device gets removed 
CURA-6057
 2019-04-08 12:27:32 +02:00
Lipu Fei
7d096e5734 Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine 2019-04-08 09:09:07 +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
Jaime van Kessel
ed503cb6ec Removed platform check that always had the same result 
The UM.Application.platform property has been removed by someone for quite some time.
I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined
 2019-04-05 17:07:12 +02:00
Lipu Fei
6892307be3 Fix typo 2019-04-05 10:49:36 +02:00
Lipu Fei
f2234cffa4 Fix extruder enable/disable problem in color scheme 2019-04-05 10:43:09 +02:00
Lipu Fei
5074cf69dd Fix typing 
CURA-6435
 2019-04-05 09:57:58 +02:00
Lipu Fei
d5f4fd43dd Fix typing 
CURA-6435
 2019-04-05 09:42:24 +02:00
Lipu Fei
945fa35946 Fix incorrect reference in UM2UpgradeSelectionMachineAction 
CURA-6435
 2019-04-05 09:09:00 +02:00
Ghostkeeper
bd1712cb10
Spelling fix: Overriden -> Overridden 
I think some of us got the spelling of this word wrong in their heads.
 2019-04-04 14:39:01 +02:00
Jaime van Kessel
932a5c8fc9 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura 2019-04-04 14:38:18 +02:00
Lipu Fei
53c38e0a80 Fix quality_changes container handling in project loading 
CURA-6441

Containers are created but not added...
 2019-04-04 09:21:22 +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
Jaime van Kessel
75386c0b7e Change the font of the customMachineSettings window 
CURA-6057
 2019-04-03 17:08:07 +02:00
Jaime van Kessel
362036e064 Fix small display issue where a line was drawn between the tabs 
CURA-6057
 2019-04-03 17:03:39 +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
Ian Paschal
6f3cd38682
Merge pull request #5388 from Ultimaker/CL-1266_cloud_association_for_manual_ips 
[WIP] CL-1266 Cloud association for manual IPs
 2019-04-01 15:55:47 +02:00
Simon Edwards
8700cbe4e8 Mypy fix 
CL-1266
 2019-04-01 15:22:38 +02:00
Jaime van Kessel
5105b67a8c Remove unused entries from the theme 2019-04-01 15:18:49 +02:00
Simon Edwards
19c6fceb0c Delay using getPluginPath() until after start up time 
CL-1266
 2019-04-01 14:30:20 +02:00
Lipu Fei
9575c6b3b3 Fix merge conflicts 2019-04-01 13:28:42 +02:00
Ian Paschal
feec1ffb56 Improve signals 
Contributes to CL-1267
 2019-04-01 12:17:01 +02:00
Lipu Fei
9ae8d2f88c Use NotificationIcon and simplify code 
CURA-6151
 2019-04-01 11:52:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers 
CURA-6151
 2019-04-01 10:38:43 +02:00
Remco Burema
dc8524b90d Fix 'DiscoverUM3Action' required attention from user in flow. [CURA-6057] 2019-03-29 16:23:16 +01:00
Remco Burema
3ca8ba421a Move CuraStage back to where plugins expect it. 2019-03-29 13:11:03 +01:00
Ian Paschal
58f1c05564 Actually fix tests 
Contributes to CL-1266
 2019-03-29 12:27:58 +01:00
Jaime van Kessel
b4134e6dbb Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-29 10:44:29 +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
Remco Burema
60920c89af Remove old send slice-info confirm: part of the new onboard. [CURA-6057] 2019-03-29 09:33:41 +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