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

5951 Commits

Author SHA1 Message Date
Ghostkeeper
d6f116b156
Don't crash on editing metadata entries of non-registered materials 
Sometimes we need to create a temporary material profile just to save it to file.

Contributes to issue CURA-5787.
 2019-02-14 14:03:38 +01:00
Ghostkeeper
8c3f7a065d
Remove unused import 
Discovered during work on CURA-5787.
 2019-02-14 13:54:03 +01:00
Ghostkeeper
e2a7a68883
Give a warning when you can't update metadata because it's read-only 
This bit me in the bum today.
 2019-02-14 13:26:20 +01:00
Ian Paschal
af565aff55 Clarify if using key or human-readable name 
This is refering to "glass", not "Glass". According to @lipufei, "name" should denote a human readable/capitalized name.

Contributes to CL-1250
 2019-02-14 11:49:43 +01:00
Ian Paschal
0275de7f77 Make sure to set the build plate so it's not empty 
Contributes to CL-1250
 2019-02-14 11:46:41 +01:00
Jaime van Kessel
a8f66a558c Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
Ian Paschal
e39e09a692 Fix incorrect method name 
Contributes to CL-1165
 2019-02-13 15:21:09 +01:00
Simon Edwards
8f37421c11
Merge pull request #5291 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Ensure pop-up is not shown if cloud connection is already configured
 2019-02-13 14:30:40 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
25cfd4f496 Avoid double negatives in cloud flow metadata 
Contributes to CL-1222
 2019-02-13 14:21:23 +01:00
Jaime van Kessel
f35ad5cf83 Merge branch 'CURA-5977_test_definition_container' of github.com:Ultimaker/Cura 2019-02-13 14:02:09 +01:00
Jaime van Kessel
df3485aaec Add a where to buy link underneath the install button for material 
CURA-6148
 2019-02-13 13:37:10 +01:00
Simon Edwards
d08b8d813d Generate the correct path for the svg on Windows. 
CL-1222
 2019-02-13 12:24:59 +01:00
Ian Paschal
cf4bcf81e7 Make pop up permanent 
Contributes to CL-1222
 2019-02-13 11:49:53 +01:00
Ian Paschal
d74f4f36bd Improve cloud flow checks 
Contributes to CL-1222
 2019-02-13 11:30:31 +01:00
Ian Paschal
8fecf7fb39 Don't crash when clicking don't show again 
Contributes to CL-1222
 2019-02-13 11:04:51 +01:00
Ian Paschal
c15e49876a Revert "Use parseBool instead of "is True" and "is False"" 
This reverts commit aa454ea357b8a64405601b37e1a0ec5f230a34c5.
 2019-02-13 11:00:11 +01:00
Ian Paschal
aa2acac244 Fix typo 
Contributes to CL-1222
 2019-02-13 10:52:37 +01:00
Ian Paschal
70fc363048 Fix cloud pop up paths 
Contributes to CL-1222
 2019-02-13 10:49:53 +01:00
Ian Paschal
aa454ea357 Use parseBool instead of "is True" and "is False" 
Contributes to CL-1222
 2019-02-12 12:18:29 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Ian Paschal
0e913044de Ensure pop-up is not shown if cloud connection is already configured 
Contributes to CL-1222
 2019-02-11 10:21:54 +01:00
Ghostkeeper
d2e1c47029
Use spaces instead of tabs 
Yeah, or remove extraneous tabs at the end of a line.
 2019-02-11 08:53:42 +01:00
ChrisTerBeke
9d6bd4b29a
Check access token before using it 2019-02-08 21:03:59 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0' 2019-02-08 14:23:36 +01:00
Ian Paschal
8807243108
Merge pull request #5286 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop-up (Finalize copy)
 2019-02-08 14:09:53 +01:00
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
473633de2c
Merge branch '4.0' 2019-02-08 11:28:06 +01:00
Ghostkeeper
672271d525
Fix running automated tests on Python 3.6 
This prevents the PyCapsule_GetPointer error.
 2019-02-08 09:50:20 +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
Ghostkeeper
506ce2e6e5
Merge branch 'CURA-5916-show-printing-guidelines-for-custom-material-section' 
Contributes to issue CURA-5916.
 2019-02-08 09:32:56 +01:00
Ian Paschal
19f1a2f2d0 Fix line length 
Contributes to CL-1237
 2019-02-08 09:23:38 +01:00
Diego Prado Gesto
b0cf5f25c6 Merge branch '4.0' 2019-02-07 17:36:44 +01:00
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile 
CURA-5916
 2019-02-07 16:08:50 +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
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
Ian Paschal
3a4fcb354a Show cloud connection flow pop-up 
Contributes to CL-1222
 2019-02-06 12:04:15 +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
348689eace Add cloud flow graphics 
Contributes to CL-1222
 2019-02-06 11:58:51 +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