GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 02:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,328 Commits 295 Branches 268 Tags
Commit Graph

16328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
a12c0e8d9e Remove superfluous import 2018-09-28 11:51:33 +02:00
fieldOfView
bc52830c89 Move getDefaultFirmwareName() into GlobalStack 2018-09-28 11:49:00 +02:00
fieldOfView
9a98341bda Fix code-style and typing 2018-09-28 11:38:42 +02:00
fieldOfView
7c23a4e187 Merge branch 'master' into feature_firmware_updater 2018-09-28 11:32:28 +02:00
Jaime van Kessel
f54a85688f
Merge pull request #4307 from KangDroid/full_screen_test 
Re-Enable fullscreen shortcut and add menu on ViewMenu
 2018-09-28 11:26:26 +02:00
Jaime van Kessel
c2f0a33b42
Merge branch 'master' into full_screen_test 2018-09-28 11:24:22 +02:00
Aleksei S
9bd4ab2faa Added unittest for PrintInformation class 2018-09-28 10:46:14 +02:00
Lipu Fei
84bad92f10 Verbose output for Windows CI 2018-09-28 10:02:22 +02:00
Jaime van Kessel
3b70e5eb6b Fix typing 
For some reason, my MyPy started acting up once I started using the PythonPath while calling it.
 2018-09-27 20:01:55 +02:00
Jaime van Kessel
57334dd751 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 17:52:00 +02:00
Lipu Fei
dc2c074bc0 Verbose output for Linux CI 2018-09-27 17:50:39 +02:00
Jaime van Kessel
f585afe77b Fix spacing 2018-09-27 17:31:45 +02:00
Jaime van Kessel
7310a677ce Clean up more code 
This fixes some typing and moves a property to protected, as it should be
 2018-09-27 16:07:18 +02:00
Jaime van Kessel
c15f8aa693 Move printer type checking to where it belongs; inside the UM3 plugin. 2018-09-27 15:54:23 +02:00
Jaime van Kessel
889035ebfa Fixed typo 2018-09-27 15:42:12 +02:00
Jaime van Kessel
d7901907af Fix typing 2018-09-27 15:37:08 +02:00
Jaime van Kessel
b58c01400b Updated typing & documentation 2018-09-27 15:28:53 +02:00
Jaime van Kessel
1467e703ae No longer make BuildVolume set max bounds. 
We didn't use it anymore and it added an extra requirement for buildvolume to depend on Application
 2018-09-27 15:16:46 +02:00
Ian Paschal
fc333d53c5 Replaced print job context menu 
Contributes to CL-897, CL-1051
 2018-09-27 14:54:40 +02:00
Jaime van Kessel
d83241f13a Add missing typing to number of decorators 2018-09-27 14:29:09 +02:00
Jaime van Kessel
853ccbdb71 Fix mypy typing issue 2018-09-27 14:00:28 +02:00
Jaime van Kessel
4adbfd467e Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 13:58:47 +02:00
Ghostkeeper
0ce9bf61be
Move MIME type declarations into constructors of readers 
So that if you disable the plug-in, the MIME type declaration is also not added.

Fixes #4151.
 2018-09-27 13:58:06 +02:00
Jaime van Kessel
8d9a1fb85d Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 13:47:32 +02:00
Jaime van Kessel
f8369703ed Connect signals before loading auth data 
CURA-5744
 2018-09-27 13:45:46 +02:00
Ian Paschal
302f9a95b3 Cleaned-up printe job info block 
Contributes to CL-897, CL-1051
 2018-09-27 13:40:46 +02:00
ChrisTerBeke
6d402806ac Ensure logged in state is not always set to False after loading from preferences 2018-09-27 13:35:18 +02:00
Ghostkeeper
88ba2ac345
Define gcode.gz extension in GCodeGzReader 
So if you were to disable the GCodeGzReader plug-in, you will now no longer see the extension in the files you can read.

Fixes #4151.
 2018-09-27 13:27:42 +02:00
Jaime van Kessel
47c5dbaf84 Add extra unit test that tests the storing and loading of data to the preferences 2018-09-27 13:07:37 +02:00
Jaime van Kessel
202cf698c3 Change callback for succes / failure to the new location 
CURA-5744
 2018-09-27 11:56:19 +02:00
Ghostkeeper
80804b232f
Merge branch 'refactor_singleton_settingsbase' 2018-09-27 11:53:11 +02:00
Lipu Fei
329b38663e Fix code style 2018-09-27 11:44:10 +02:00
Lipu Fei
b1198ee1b8 Remove an if-else block that assumes no ExtruderStack 
There is always an ExtruderStack, so the else-block will never be
executed.
 2018-09-27 11:44:10 +02:00
Jaime van Kessel
649f1c8961 Make it optional for the AuthService to have a preference object 
This should make it easier if we ever want to re-use the authService, since
it no longer has a hard link with the Preferences

CURA-5744
 2018-09-27 11:42:12 +02:00
Jaime van Kessel
0ccbabd857 Switch SHA512 implementation to use the one from hashlib 
CURA-5744
 2018-09-27 11:37:44 +02:00
Jaime van Kessel
506ec5109d Moved loading of the authentication to the account 
CURA-5744
 2018-09-27 11:37:22 +02:00
Ghostkeeper
1717281d2b
Always provide extruder_nr for all models 
Even if you only have one extruder in your printer. This is more consistent, and probably also faster because executing one set-addition in Python is probably still slower than sending those 20 extra bytes over the socket and parsing them in C++...

Contributes to issue CURA-4410.
 2018-09-27 11:20:24 +02:00
Jaime van Kessel
cf6d3b9289 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 11:11:54 +02:00
Jaime van Kessel
1c8804ff2c Changed documentation style to doxygen 
CURA-5744
 2018-09-27 11:03:17 +02:00
ChrisTerBeke
246d12a596 Remove client.package.download scope until that is deployed on production 2018-09-27 10:48:22 +02:00
ChrisTerBeke
52ffe39c07 Small fixes in settings 2018-09-27 10:33:50 +02:00
ChrisTerBeke
185a1707b2 Merge branch 'master' into CURA-5744-move-oauth-login 2018-09-27 09:40:44 +02:00
Jaime van Kessel
d5dbf91a4f Switch unit test to use decoratior instead of with waterfall 
CURA-5744
 2018-09-26 17:23:36 +02:00
Jaime van Kessel
16ff1c3712 Add property for the accessToken 
CURA-5744
 2018-09-26 17:12:00 +02:00
alekseisasin
2a201cef23 Prevent cura crash after setting Print as Support in per object setting 
menu
CURA-5766
 2018-09-26 17:06:24 +02:00
Jaime van Kessel
067e59a254 Add logged_in as argument to loginStateChanged callback 
CURA-5744
 2018-09-26 17:06:09 +02:00
Lipu Fei
3c8368827b Remove unused functions in ExtruderManager 2018-09-26 17:04:15 +02:00
Lipu Fei
7a681a2ae4 Move Cura custom setting functions to a separate file 2018-09-26 16:54:00 +02:00
THeijmans
d5c86365f8 S5 profile optimizations 
Removing the prime blob, equalizing flows and avoiding supports.
 2018-09-26 15:02:25 +02:00
Simon Edwards
baa8064ec7
Merge pull request #4429 from Ultimaker/cura_connect_improvements_3.5 
Cura connect improvements 3.5
 2018-09-25 17:26:55 +02:00