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

5880 commits

Author SHA1 Message Date
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Ghostkeeper
10c9678edc
Merge branch '4.0' 2018-12-19 11:52:11 +01:00
Ghostkeeper
56d0a52fac
Documentation and code style 2018-12-19 11:51:46 +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
d3419f2e07 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 11:15:31 +01:00
Ghostkeeper
f1c28498a6
Display 0 if there are no measurements for minimum values 
Don't display max float then.
 2018-12-19 11:00:00 +01:00
ChrisTerBeke
60335681c7 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 10:47:03 +01:00
Ghostkeeper
75d1d563ba
Merge branch 'fix_machine_settings_dialog' into 4.0 2018-12-19 09:41:43 +01:00
susisstrolch
6600cea632 Add missing baudrate to USB connection. 
Extend the baudrate list by 500.000bd to also detect Vertex Delta 3D (K8800). Fixes #4952
 2018-12-18 16:51:16 +01:00
ChrisTerBeke
0588c54035 Start work on cloud icon 2018-12-18 16:29:13 +01:00
Diego Prado Gesto
8206fde223 Remove the non-load-only-when-testing check 
Contributes to CURA-6005.
 2018-12-18 16:24:13 +01:00
Aleksei S
7cf1df7435 Remove back Cura.ExtrudersModel{}, because if retrieve the model from backend 
the tabs cannot be removed after model update. The QML bug
CURA-6036
 2018-12-18 16:19:21 +01:00
Diego Prado Gesto
8e78582b61 Add correct copyright and license header to all the files in the plugin 
Contributes to CURA-6005.
 2018-12-18 16:17:37 +01:00
Diego Prado Gesto
da69c16e09 Split the constants in to files, indicating which constants each file 
stores.

Contributes to CURA-6005.
 2018-12-18 16:14:13 +01:00
Aleksei S
1ac5403c21 Remove extruder tabs from tabView 
CURA-6036
 2018-12-18 15:52:26 +01:00
Ghostkeeper
874646a80e
Merge branch '4.0' into add_comment_prime_tower 2018-12-18 15:44:27 +01:00
ChrisTerBeke
25caf1a087 Fix merge conflicts 2018-12-18 14:44:13 +01:00
Jaime van Kessel
a181ffe79d Merge branch 'fix_print_monitor_dark_theme' of https://github.com/fieldOfView/Cura into 4.0 2018-12-18 13:54:45 +01:00
Lipu Fei
e885b52737 Add time prime tower into Cura.proto 2018-12-18 13:42:23 +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
9b6e52a5be Make monitor item background themable 2018-12-18 13:08:18 +01:00
Lipu Fei
dff9a3dfb2 Fix None problem in project loading 2018-12-18 10:52:11 +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
Lipu Fei
9f52a52ea3 Fix ExtruderModel reference in machine settings dialog 2018-12-18 09:32:26 +01:00
Diego Prado Gesto
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin 
Remove unused file.

Contributes to CURA-6005.
 2018-12-18 07:17:37 +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
fieldOfView
7d6e698f43 Fix (USB) print monitor in dark theme 2018-12-17 17:37:21 +01:00
Jaime van Kessel
3f7c922734 Add missing type for g-code reader 2018-12-17 17:37:12 +01:00
Diego Prado Gesto
62ac10d112 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 17:30:20 +01:00
Diego Prado Gesto
d6212d5a39 Add elide in the showcase title and reduce the height a bit so there are 
only 2 lines for the title.
 2018-12-17 17:29:24 +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
Jaime van Kessel
06d9fd9dbe Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 15:26:36 +01:00
Jaime van Kessel
1352193654 Ensure that the sourceSize is set correctly 2018-12-17 15:26:10 +01:00
Jaime van Kessel
53da111617 Change "Rating" to "Your rating" 2018-12-17 15:21:48 +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
Diego Prado Gesto
02825a062f Change the remove and the info buttons 
Contributes to CURA-6005.
 2018-12-17 13:38:41 +01:00