3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28475 commits 302 branches 270 tags 770 MiB
Commit graph

1715 commits

Author SHA1 Message Date
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Lipu Fei
ee72284616 Use appropriate log level 
CURA-6035
 2019-01-03 08:32:42 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material 
CURA-6033
 2018-12-31 11:01:30 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Marijn Dee
12a4a5e9f5 Fixing the rest of the automatic test failures 2018-12-21 15:06:02 +01:00
Marijn Dee
131211e604 Fixed the unit tests 2018-12-21 09:42:28 +01:00
ChrisTerBeke
5403f5241b Fix not registering cloud output device for every machine 2018-12-20 17:21:07 +01:00
Marijn Dee
9d27c29c8c Fixed indentation and relative import, tests still fail though 2018-12-20 17:04:17 +01:00
Marijn Dee
403010aa90 Mirrored the changes made to the models in Commons 2018-12-20 16:32:00 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
Lipu Fei
346d8d884e Remove unnecessary patches in TestSendMaterialJob 
CURA-6035
 2018-12-20 14:23:39 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob 
CURA-6035
 2018-12-20 14:20:34 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
Lipu Fei
68372aff60 Use MaterialManager in SendMaterialJob 
CURA-6035
 2018-12-20 10:45:40 +01:00
Remco Burema
9dbc642967 SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035] 2018-12-19 17:34:31 +01:00
ChrisTerBeke
beb68213f4 Remove much logging or use debug level, fix cloud icon not appearing right away 2018-12-19 14:14:44 +01:00
Ian Paschal
e62ce0e4ca Make printer carousel more flexible/robust 
Contributes to CL-1157
 2018-12-19 13:18:53 +01:00
Diego Prado Gesto
acabd06542 Change the large_nonbold to large in one remaining component 
Contributes to CURA-6025.
 2018-12-19 12:32:18 +01:00
ChrisTerBeke
dd2f12f68a Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 12:11:01 +01:00
ChrisTerBeke
cf06cb5351 Do not call printer_device.key before checking if it exists 2018-12-19 12:10:24 +01:00
ChrisTerBeke
d2746d03c1 Fix type checking for DiscoverUM3Action 2018-12-19 11:56:43 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Ian Paschal
142ac56d78 Add keyboard navigation for printer carousel 2018-12-19 11:26:38 +01:00
ChrisTerBeke
5e9fe3fe50 Fix some codestyle, make connectionType a property as it's needed in QML 2018-12-19 11:21:50 +01:00
ChrisTerBeke
0588c54035 Start work on cloud icon 2018-12-18 16:29:13 +01:00
ChrisTerBeke
25caf1a087 Fix merge conflicts 2018-12-18 14:44:13 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types 
[4.0] Every output device should define its connection type
 2018-12-18 13:23:02 +01:00
Ian Paschal
627c647fbc Center navigation dots 
Contributes to CL-1151
 2018-12-18 13:17:25 +01:00
Jaime van Kessel
d4bb50886f Merge branch 'CURA-6011_connection_types' of github.com:Ultimaker/Cura into CURA-6011_connection_types 2018-12-18 09:40:20 +01:00
Jaime van Kessel
84a7f2e5a2 Fix review comments 
CURA-6011
 2018-12-18 09:40:08 +01:00
ChrisTerBeke
74bec96ce8 Fix a relative import 2018-12-17 17:41:02 +01:00
ChrisTerBeke
12866c107b Fix again 2018-12-17 17:39:48 +01:00
ChrisTerBeke
c75fa5de3d Fix merge conflict 2018-12-17 17:39:30 +01:00
Ian Paschal
aed0bb27f2
Merge pull request #4995 from Ultimaker/CL-1151_add_monitor_carousel 
CL-1152 Add monitor carousel
 2018-12-17 17:05:50 +01:00
Ian Paschal
5c697ab5be Make hints clickable 
Contributes to CL-1151
 2018-12-17 16:58:51 +01:00
ChrisTerBeke
70421e5ac5
Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 15:46:28 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6 
Increment API version to 6
 2018-12-17 15:43:09 +01:00
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
Ian Paschal
cb6e4ff2d1 Organize MonitorStage.qml better 2018-12-17 14:05: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
Lipu Fei
6992fd2991 Update plugin versions to match package versions 
CURA-6019
 2018-12-17 13:03:21 +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