3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
25644 commits 302 branches 270 tags 773 MiB
Commit graph

7988 commits

Author SHA1 Message Date
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
Jaime van Kessel
ffd7a001fb Add notification icon to the installed tab of the toolbox 
CURA-6151
 2019-03-28 13:31:51 +01:00
Jaime van Kessel
6c26dd38ec Clean up code for the toolbox tab button 
Removed unused properies and made it use states for it's changing properties.
This makes it a lot easier to read and understand what it's actually doing

CURA-6151
 2019-03-28 13:24:25 +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
Jaime van Kessel
1e02a20745 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6151-Notify-updates-from-marketplace 2019-03-27 12:56:02 +01:00
Jaime van Kessel
e3f2c06542 Remove usage of canUpdate slot 
This makes it a bit cleaner, since having it as a slot is a bit weird in the first place (and forced
all kinds of hacks to ensure it got re-evaluated)

CURA-6151
 2019-03-27 12:54:20 +01:00
Jaime van Kessel
f4f94b10d2 Move "canUpdate" logic from toolbox to PackageManager 
CURA-6151
 2019-03-27 12:48:10 +01:00
Lipu Fei
1c39d0c015 Fix merge conflicts 2019-03-26 15:55:58 +01:00
Lipu Fei
6843fb1ffb Load change log from file for on-boarding page 2019-03-26 15:49:40 +01:00
Simon Edwards
eed810af35
Merge pull request #5479 from Ultimaker/CL-1287_improved_cloud_pop_up 
CL-1287 Improved Cloud pop-up
 2019-03-26 12:17:35 +01:00
Ghostkeeper
f3d75fa1ef
Merge branch 'lithophane_defaults' of https://github.com/BagelOrb/Cura into BagelOrb-lithophane_defaults 2019-03-26 09:33:10 +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
Diego Prado Gesto
74ffee7810 Fix typo in a previous commit 2019-03-22 18:03:01 +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