GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 07:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,414 Commits 295 Branches 268 Tags
Commit Graph

18414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
937dce591d Finalize copy 
Contributes to CL-1222
 2019-02-08 13:53:02 +01:00
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop up
 2019-02-08 13:26:03 +01:00
Ian Paschal
0dfcaadc49 Typecheck improvements 
Contributes to CL-1222
 2019-02-08 13:13:26 +01:00
Ian Paschal
53e07eadd3 Allow for optional typing 
Contributes to CL-1222
 2019-02-08 13:03:10 +01:00
Ian Paschal
2d77792988 Add some typings 
Contributes to CL-1222
 2019-02-08 12:54:10 +01:00
Ghostkeeper
7080bc0dcc
Fix experimental label 
We have a system for this nowadays.

Contributes to issue CURA-6196.
 2019-02-08 12:03:08 +01:00
Jaime van Kessel
a1d08dab69 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-08 10:51:08 +01:00
Jaime van Kessel
91f0d76c8a Fix crash when user was logged in but there was no internet connection on boot 2019-02-08 10:50:17 +01:00
THeijmans
151c8919cd Upload CC06 PLA profiles for TPM 
These are experimental for Ultimaker materials.
 2019-02-08 10:42:43 +01:00
Ian Paschal
b77c41c5e6
Merge pull request #5279 from Ultimaker/CL-1237_fix_move_to_top 
Cl 1237 fix move to top
 2019-02-08 09:54:45 +01:00
Ian Paschal
5f0d9fc16a Merge remote-tracking branch 'origin/4.0' into CL-1237_fix_move_to_top 2019-02-08 09:41:41 +01:00
Ian Paschal
729f4c9d52 Revert "Fix line length" 
This reverts commit 19f1a2f2d047f646c227e3fbb0d74f2cb7d57abd.
 2019-02-08 09:40:56 +01:00
Ian Paschal
19f1a2f2d0 Fix line length 
Contributes to CL-1237
 2019-02-08 09:23:38 +01:00
Jaime van Kessel
e869829f10 Updated the icon so it also works in the dark theme 2019-02-07 15:17:07 +01:00
Lipu Fei
e5071eac5b Fix typing 2019-02-07 14:31:40 +01:00
Ian Paschal
2b6bab9552 Re-enable firmware check 
Contributes to CL-1222
 2019-02-06 16:42:26 +01:00
Remco Burema
3a94745667 Make sliders reappear in simulation-view. [CURA-6183] 2019-02-06 16:01:01 +01:00
Ian Paschal
fcb52dd1cf Show cloud flow pop-up if machine is removed from cloud 
Contributes to CL-1222
 2019-02-06 14:26:11 +01:00
Ian Paschal
162fdad4e4 Improve conditions for starting cloud flow 
Contributes to CL-1222
 2019-02-06 13:58:33 +01:00
Jaime van Kessel
8d7b623879 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-06 12:37:50 +01:00
Jaime van Kessel
c7c57c167c Fix call to non-existing function 2019-02-06 12:37:30 +01:00
Simon Edwards
8e569126ff Use the older but backwards compatible API for moving print jobs in the queue. 
CL-1237
 2019-02-06 12:19:59 +01:00
Simon Edwards
18786a1e7d Fix the default content-type for HTTP PUT requests in NetworkedPrinterOutputDevice 
CL-1237
 2019-02-06 12:18:32 +01:00
Ian Paschal
3a4fcb354a Show cloud connection flow pop-up 
Contributes to CL-1222
 2019-02-06 12:04:15 +01:00
Ian Paschal
ae7936a823 Update theme.json 
Contributes to CL-1222
 2019-02-06 12:01:52 +01:00
Ian Paschal
b1104124f3 Add address property to ClusterUM3OutputDevice 
This was necessary because it was the only way to get the address (NetworkPrinterDevice and PrinterOutputDevice returned empty strings)

Contributes to CL-1222
 2019-02-06 12:01:42 +01:00
Ian Paschal
01ca3546aa Add activeMachineAddress to MachineManager for easy access 
Contributes to CL-1222
 2019-02-06 11:59:39 +01:00
Ian Paschal
348689eace Add cloud flow graphics 
Contributes to CL-1222
 2019-02-06 11:58:51 +01:00
Ian Paschal
58d998af68 Add theme entry for message image 
Contributes to CL-1222
 2019-02-06 11:58:22 +01:00
Ian Paschal
5c0c176730 Show confirmation pop-up for cloud flow 
Contributes to CL-1222
 2019-02-05 16:52:15 +01:00
Ian Paschal
70c384bd4e Finish adding cloud flow checks 
Contributes to CL-1222
 2019-02-05 16:51:47 +01:00
Ian Paschal
b29f3d3bd0 Improve comment 
Contributes to CL-1222
 2019-02-05 16:50:50 +01:00
Ian Paschal
c41e81a6b9 Set required firmware version for cloud to 5.2.0 
Contributes to CL-1222
 2019-02-05 16:50:36 +01:00
Ian Paschal
d022672bcf Add signal to CloudOutputDeviceManager for added cloud device 
Contributes to CL-1222
 2019-02-05 16:49:54 +01:00
Jaime van Kessel
f2fbb4e989 Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0 2019-02-05 13:38:44 +01:00
Jaime van Kessel
91f90e7d40 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-05 13:32:14 +01:00
Jaime van Kessel
b6f5dd8f94 Fix display of long names in sync configuration menu 2019-02-05 13:31:50 +01:00
Remco Burema
5c54cb740a Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174] 2019-02-05 13:24:28 +01:00
Lipu Fei
cfdadbaffb
Merge pull request #5270 from Ultimaker/action_panel_per_stage 
Let each stage create its own action panel
 2019-02-05 11:16:00 +01:00
Jaime van Kessel
d59889a4ab Fix logo in about popup 2019-02-05 11:13:47 +01:00
Jaime van Kessel
d57d4fd277 Fix text color not being themed 2019-02-05 11:05:33 +01:00
Lipu Fei
bac344a692 Show extruder names in disabled message 
CURA-5693
 2019-02-05 09:26:50 +01:00
Lipu Fei
7964465eb5 UM2+ do not support olsson block upgrade 
CURA-6133
 2019-02-05 07:59:49 +01:00
Ian Paschal
9c82cfd6fa Comment out firmware check for dev purposes 
Contributes to CL-1222
 2019-02-04 16:52:01 +01:00
Ghostkeeper
7569ed9834
Another adjustment to account creation commercial text 
The marketing team wants to make this small adjustment too.
 2019-02-04 16:18:54 +01:00
Ian Paschal
4c1131a7b4 Remove some redundant calls 
Contributes to CL-1222
 2019-02-04 16:11:48 +01:00
Ian Paschal
f2ddb2808f Add firmware check 
Contributes to CL-1222
 2019-02-04 16:02:38 +01:00
Ghostkeeper
61475a79cf
Fix font size of buildplate warning 
This was most likely copied from an old release but the font in question was deleted.
 2019-02-04 15:23:57 +01:00
Ghostkeeper
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property 
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.

Contributes to issue CURA-6086.
 2019-02-04 15:19:09 +01:00
Ghostkeeper
5992e66ed6
Move action panel into each stage 
They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button.

Contributes to issue CURA-6086.
 2019-02-04 15:08:59 +01:00