3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
17713 commits 305 branches 272 tags 787 MiB
Commit graph

908 commits

Author SHA1 Message Date
Daniel Schiavini
c5f438819a STAR-322: Improving documentation 2018-12-17 15:11:01 +01:00
Daniel Schiavini
d28ac5e120 STAR-322: Improving documentation 2018-12-17 14:57:57 +01:00
Daniel Schiavini
da974d9868 STAR-322: Improving documentation 2018-12-17 14:51:57 +01:00
Daniel Schiavini
75d7d49349 STAR-322: Mocking the CuraApp 2018-12-17 14:41:28 +01:00
Daniel Schiavini
3b367938de STAR-322: Removing TestSendMaterialJob temporarily 2018-12-17 13:53:31 +01:00
Daniel Schiavini
b6f90f1ab2 STAR-322: Using cura constants 2018-12-17 13:29:20 +01:00
Daniel Schiavini
a1cb09f73f STAR-322: Sorting clusters 2018-12-17 13:24:07 +01:00
Daniel Schiavini
34f56b046a STAR-322: Review comments 2018-12-17 13:13:44 +01:00
Daniel Schiavini
99d52692e3 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload 2018-12-17 12:34:38 +01:00
ChrisTerBeke
02a2585ad1 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 12:33:15 +01:00
Daniel Schiavini
87c1392173 STAR-322: Fixing tests 2018-12-17 12:05:25 +01:00
Daniel Schiavini
9eb743bcb8 STAR-322: Making mypy happy 2018-12-17 12:01:10 +01:00
Ian Paschal
6178f9ddf6 Improve code style and line lengths 2018-12-17 11:49:09 +01:00
Daniel Schiavini
9f4b7bd703 STAR-322: Improving logging and cluster connection 2018-12-17 11:28:16 +01:00
Ian Paschal
ff1a0e30f6 Code style & comments 2018-12-17 10:42:41 +01:00
Daniel Schiavini
9086105204 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload 2018-12-17 10:38:29 +01:00
Ian Paschal
77deabf6d4 Code style 2018-12-17 09:43:24 +01:00
Daniel Schiavini
3194a6d0bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload 2018-12-14 16:17:36 +01:00
ChrisTerBeke
2772b3bcbd Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:10:20 +01:00
Daniel Schiavini
e815d5da8f STAR-322: Avoiding lambdas and direct callbacks to avoid gc 2018-12-14 16:02:28 +01:00
Ghostkeeper
2e835bf48d
Merge branch '4.0' 2018-12-14 15:02:30 +01:00
Daniel Schiavini
2f08854097 STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished 2018-12-14 14:50:15 +01:00
Daniel Schiavini
4dc8edb996 STAR-322: Fixing the multipart upload 2018-12-14 12:48:40 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag 
CURA-6015
 2018-12-13 14:12:04 +01:00
ChrisTerBeke
819f8531a2 Use CuraConstants for Cloud printing API root 2018-12-13 11:54:10 +01:00
Daniel Schiavini
fed779d0d2 STAR-322: Implementing multi-part upload (doesnt always work) 2018-12-12 17:31:08 +01:00
ChrisTerBeke
47c6321e27 Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 16:59:47 +01:00
Ian Paschal
1ababf38ad Use full printer name if no tag is known 
Contributes to CL-1173
 2018-12-11 16:42:44 +01:00
Daniel Schiavini
0467756ed6 STAR-322: Adding return type to init method 2018-12-11 16:01:52 +01:00
Ian Paschal
daeb86bdb1 Use short printer family tags 
Contributes to CL-1173
 2018-12-11 15:55:03 +01:00
Daniel Schiavini
f04db63594 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 14:28:07 +01:00
Daniel Schiavini
a5d8e6ceb8 STAR-322: Removing the print job after it was done 2018-12-11 14:28:00 +01:00
ChrisTerBeke
7b7c687db7 Remove dismissable = False from messages as it's the default 2018-12-11 12:46:05 +01:00
ChrisTerBeke
e52339a424 Fix typing for output_device param in cloud output controller 2018-12-11 12:44:37 +01:00
Daniel Schiavini
073e8cd6dc Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 12:39:02 +01:00
Diego Prado Gesto
1f26b55731
Merge pull request #4966 from Ultimaker/CL-1160_fix_materials_none_type 
CL-1160 Replace fix for 'None' materials
 2018-12-11 12:14:34 +01:00
Diego Prado Gesto
4949f39c34 Add translatable strings to empty and unknown material 
Contributes to CL-1160.
 2018-12-11 12:10:32 +01:00
Daniel Schiavini
4fddf1b7c7 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 11:56:43 +01:00
Daniel Schiavini
d54fc4182b STAR-322: Fixing style errors 2018-12-11 11:56:36 +01:00
Diego Prado Gesto
70b0d16fa4 Fix typo 
Missing parenthesis.

Contributes to CL-1160.
 2018-12-11 11:53:26 +01:00
Ian Paschal
1c373b7205 Improve config override text 
Contributes to CL-1152
 2018-12-11 11:51:13 +01:00
Diego Prado Gesto
2b2e8ebb31 Add some safety checks when checking for the guid of the material 
Don't crash if the guid doesn't exist.

Contributes to CL-1160.
 2018-12-11 11:37:01 +01:00
ChrisTerBeke
4365b03b12 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 11:12:43 +01:00
ChrisTerBeke
816c6bd4ec Fixes after merging UI changes 2018-12-11 11:12:36 +01:00
Daniel Schiavini
7668801564 STAR-322: Adding documentation and fixing model types 2018-12-11 11:12:32 +01:00
ChrisTerBeke
79430f9faf Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-11 10:56:38 +01:00
Ian Paschal
0f357e1078 Replace fix for 'None' materials 
This was fixed in 4.0 and accidentally got reverted when merging another branch in.

Contributes to CL-1160
 2018-12-11 10:51:05 +01:00
Marijn Deé
fa7cab3246 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 09:27:48 +01:00
Marijn Deé
3b54cb4b24 Use the NetworkManagerMock, added tests for the other functions 2018-12-11 09:27:40 +01:00