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

18720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
3040fde9eb
Merge branch '4.0' 
Conflicts:
	cura/OAuth2/AuthorizationService.py -> Code style change vs. fixing logging in while no internet connection.
 2019-02-21 08:25:21 +01:00
Simon Edwards
bcfbeba824
Merge pull request #5339 from Ultimaker/fix_cloud_connection_detection 
Use new property names for cloud connection detection
 2019-02-20 15:22:52 +01:00
Ian Paschal
10f0a5663d Update MonitorMain.qml 2019-02-20 14:32:19 +01:00
Ian Paschal
a5761cb56b Use new property names for cloud connection detection 2019-02-20 14:08:13 +01:00
Simon Edwards
163a231365
Merge pull request #5336 from Ultimaker/CL-1245_change_exception_logging_when_no_connection 
CL-1245 Change exception logging when no connection
 2019-02-20 13:30:40 +01:00
Remco Burema
b4e4b7125d Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232] 2019-02-20 13:27:05 +01:00
Simon Edwards
60547b4265
Merge pull request #5329 from Ultimaker/CL-1247_improve_cloud_disabled_states 
CL-1247 Improve cloud disabled states
 2019-02-20 13:17:11 +01:00
Remco Burema
f81ad58836 Merge branch 'ppa_contribute_compatible_format' into 4.0 2019-02-20 11:29:24 +01:00
Remco Burema
7fca9dae04 Merge branch '4.0' into ppa_contribute_compatible_format 2019-02-20 11:26:13 +01:00
Jaime van Kessel
9a1d8ea5f9 Don't serialize "definition" for material profile 
CURA-5787
 2019-02-20 10:46:49 +01:00
Ian Paschal
cb8804b86a Revert "Add some kaizen changes from #5328" 
This reverts commit 09fe06b8bf463fd0805fa767bbe34087adc0c700.
 2019-02-20 10:46:15 +01:00
Ian Paschal
09fe06b8bf Add some kaizen changes from #5328 
Contributes to CL-1245
 2019-02-20 10:45:36 +01:00
Ian Paschal
a11878b199 Log warning instead of exception if no connection 
Contributes to CL-1245
 2019-02-20 10:40:23 +01:00
Ian Paschal
164e721c42
Merge pull request #5331 from Ultimaker/monitor_tab_images 
Fix the path to the pop up images in the monitor tab.
 2019-02-20 10:17:54 +01:00
Remco Burema
8e7a66d2ec
Merge pull request #5327 from Ultimaker/CURA-6140_adjust_description_skin_overlap 
Adjust description of Skin Overlap (Percentage). [CURA-6140]
 2019-02-20 09:59:17 +01:00
Remco Burema
1608adde00 Change of wording Skin Overlap (Percentage). [CURA-6140] 2019-02-20 09:57:48 +01:00
Simon Edwards
43b1c86920 Use QUrl.fromLocalFile() to create the file:// URLs for the images 2019-02-20 09:31:51 +01:00
Wilmer Gaona
b60cfaab64
Update mendel90.def.json 
The main modification is to set absolute extrusion and machine center in the start gcode
 2019-02-19 15:32:23 -06:00
Jaime van Kessel
3f18b0b974 Increase agressiveness of short circuit logic; Just check if the node is slicable 
That should also filter out platform, buildVolume and convexHulLNodes
 2019-02-19 18:00:20 +01:00
Jaime van Kessel
b61bf3df4d Only emit signal if the properties actually changed 2019-02-19 17:46:29 +01:00
Jaime van Kessel
aef89e2bd3 Add few more cases where Camera changes caused un-needed updates 2019-02-19 17:40:44 +01:00
Simon Edwards
3ad916b565 Fix the path to the pop up images in the monitor tab. 2019-02-19 17:07:09 +01:00
Jaime van Kessel
22b70e1a34 Ignore sceneChange signals if the camera triggered them in some places 
These places weren't interested in all changes. They can probably be more
strict, but the camera is a really safe bet (and already greatly decreases
the number of updates, especially when just moving the camera)
 2019-02-19 17:06:48 +01:00
Ghostkeeper
6143906fa4
Add type for message saying it's unable to connect 
Contributes to issue CURA-6231.
 2019-02-19 15:57:09 +01:00
Jaime van Kessel
3c9f630ddd Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-19 15:43:40 +01:00
Jaime van Kessel
d53bac6eb8 Simplify the expensive call to the validation state 
Since the support angle needs to be between 0 and 90, we don't have to rely on the (expensive)
validator. We can just check that ourselves.
 2019-02-19 15:42:51 +01:00
Simon Edwards
3628941ec0
Merge pull request #5326 from Ultimaker/CL-1222_improve_cloud_flow_toggle 
Improve "don't ask me again" checkbox
 2019-02-19 15:32:12 +01:00
Simon Edwards
ebc3537537
Merge pull request #5325 from Ultimaker/CL-1222_improve_cloud_flow_toggle 
Improve "don't ask me again" checkbox
 2019-02-19 15:31:38 +01:00
Jaime van Kessel
80c83617bc Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-19 13:35:10 +01:00
Jaime van Kessel
c35aabd2c4 Add message to indicate that Cura was unable to connect with account server 
This happens when you were logged previously, but currently don't have internet acces.

CURA-6231
 2019-02-19 13:34:04 +01:00
Ian Paschal
7b3420653e Actually, just hide manage queue on cloud 
Contributes to CL-1247
 2019-02-19 12:27:41 +01:00
Ian Paschal
0ef014a542 Don't show "Review Connection" unless you're on the LAN 
Contributes to CL-1247
 2019-02-19 12:24:04 +01:00
Ian Paschal
b6b7f8cfce Disable queue link when connected to cloud 
Contributes to CL-1247
 2019-02-19 12:23:48 +01:00
Ian Paschal
e23dd2dd6b Grey-out buttons when using cloud connection 
Contributes to CL-1247
(includes some boyscoutin')
 2019-02-19 12:23:33 +01:00
Ian Paschal
c14aa3686c Add some new colors to theme 
Contributes to CL-1247
 2019-02-19 12:23:03 +01:00
Ghostkeeper
fe9d106332
Remove debug prints 2019-02-19 11:48:10 +01:00
Remco Burema
70cd7518ed Adjust description of Skin Overlap (Percentage). [CURA-6140] 2019-02-19 10:47:21 +01:00
Ian Paschal
05b5dfa05f Improve "don't ask me again" checkbox 
Contributes to CL-1222
 2019-02-19 10:13:05 +01:00
Ghostkeeper
275989d193
Merge branch 'fix_prime_tower_brim_for_raft' 2019-02-18 15:17:48 +01:00
Lipu Fei
64150cc7cf Merge remote-tracking branch 'origin/4.0' 2019-02-18 13:52:27 +01:00
Ian Paschal
0cfc258b8d
Merge pull request #5316 from Ultimaker/fix-cloud-printer-properties 
CL-1255 Manually create printer properties for cloud output device
 2019-02-18 13:33:44 +01:00
Ghostkeeper
8d263e11b1
Merge branch 'mb-enable-gyroid-support' of https://github.com/smartavionics/Cura into smartavionics-mb-enable-gyroid-support 2019-02-18 11:30:49 +01:00
Jaime van Kessel
222f8e6cdb Prevent crash for backup plugin if there is no internet connection 2019-02-18 10:38:39 +01:00
Jaime van Kessel
efeba48ffb Move initializeSettingDefinitions and setting functions to their own function 
This means we don't have to instantiate CuraApplication in the tests anymore
 2019-02-18 09:45:30 +01:00
ChrisTerBeke
f25fefdbcb Add expected mesh back to test 2019-02-15 17:24:03 +01:00
ChrisTerBeke
11cf409d71 Fix codestyle 2019-02-15 17:07:45 +01:00
ChrisTerBeke
3f11cb911d Add filesize back to expected result 2019-02-15 17:06:32 +01:00
ChrisTerBeke
897c932e80 Fix test for cloud output device ufp uploading 2019-02-15 17:03:38 +01:00
ChrisTerBeke
119c868650 Add a test for the device properties 2019-02-15 16:52:11 +01:00
ChrisTerBeke
e80eccaea3 Manually create printer properties for cloud output device 2019-02-15 16:46:47 +01:00