3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
17512 commits 313 branches 275 tags 718 MiB
Commit graph

17512 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Schiavini
4dc8edb996 STAR-322: Fixing the multipart upload 2018-12-14 12:48:40 +01:00
Daniel Schiavini
fed779d0d2 STAR-322: Implementing multi-part upload (doesnt always work) 2018-12-12 17:31:08 +01:00
Daniel Schiavini
0467756ed6 STAR-322: Adding return type to init method 2018-12-11 16:01:52 +01:00
ChrisTerBeke
64dc73aed3 remove incorrect __init__.py 2018-12-11 15:47:57 +01:00
ChrisTerBeke
21a0517d79 Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 15:22:18 +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
Diego Prado Gesto
3593b7f152
Merge pull request #4782 from Ultimaker/M&P-Setting-Optimization 
CPE and CPE+ Comb retractions and ABS first layer temperature.
 2018-12-11 13:24:43 +01:00
ChrisTerBeke
e4939cf005 Remove outdated cloud icon, will be done in another PR 2018-12-11 12:55:49 +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
ChrisTerBeke
a766effce8 Fix typing for optional callback for on_progress 2018-12-11 12:43:43 +01:00
ChrisTerBeke
c07fea1405 Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 12:39:56 +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
ChrisTerBeke
1cfc6d850a Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 12:35:19 +01:00
Diego Prado Gesto
4c82f8b74f
Merge pull request #4967 from Ultimaker/ui_rework_4_0 
Merge the entire UI rework planned for the new redesign of Cura 4.0
 2018-12-11 12:17:55 +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
0d9a09797a Merge branch 'ui_rework_4_0' into CL-1160_fix_materials_none_type 2018-12-11 11:49:27 +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
Diego Prado Gesto
4b6f4af44e Close the expandable panel when it becomes disabled 
It happens when it's open and the user loads a GCode.

Contributes to CURA-5941
 2018-12-11 11:10:45 +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
Diego Prado Gesto
4dab33d41b Remove the fancy snowflakes pattern 2018-12-11 10:44:30 +01:00
Diego Prado Gesto
f0257e2b79 Merge branch 'master' into ui_rework_4_0 2018-12-11 10:29:46 +01:00
Diego Prado Gesto
523e744527 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-12-11 10:29:29 +01:00
Diego Prado Gesto
77703e1fb8 Catch an exception from numpy that happens when loading some models 2018-12-11 09:58:23 +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
Marijn Deé
99cfef6cdc Use the NetworkManagerMock, added tests for the other functions 2018-12-11 09:25:26 +01:00
Daniel Schiavini
0357003e69 STAR-322: Testing encode independent 2018-12-10 21:47:06 +01:00
Diego Prado Gesto
716fedc782 Use no text by default for the disabled state of the panels 
Contributes to CURA-5941.
 2018-12-10 17:06:51 +01:00
Ian Paschal
d43ba59b7c
Merge pull request #4959 from Ultimaker/CL-1152_config_change_monitor_tab 
CL-1152 config change monitor tab
 2018-12-10 16:43:57 +01:00
Daniel Schiavini
bfd236dae4 STAR-322: Testing cloud printing 2018-12-10 16:11:43 +01:00
Lipu Fei
4e71af45d3
Merge pull request #4958 from Ultimaker/CURA-6018_fix_messages 
Fix styling of messages
 2018-12-10 15:53:04 +01:00
Diego Prado Gesto
4fc4aecf17 Avoid the overlapping of text when the name is too long 
Normally I happens in other languages other than English.
 2018-12-10 15:48:59 +01:00
Ian Paschal
0e19fa731f Codestyle 
Contributes to CL-1152
 2018-12-10 15:47:45 +01:00
Diego Prado Gesto
d318bb5c87 Merge branch 'master' into ui_rework_4_0 2018-12-10 15:41:28 +01:00
Diego Prado Gesto
11d8831d7a Use the capitalized version of the buildplate name 2018-12-10 15:40:18 +01:00
Diego Prado Gesto
1cd0d26db4 Change margins 
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
 2018-12-10 15:34:48 +01:00
Ian Paschal
04af8fbd50 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1152
 2018-12-10 15:33:16 +01:00
Ian Paschal
028d993bab Format .gcode.gz files too 
Contributes to CL-1152
 2018-12-10 15:27:51 +01:00
Ian Paschal
32f2b7ec1f Fix some warnings 
Contributes to CL-1152
 2018-12-10 15:05:01 +01:00