Jaime van Kessel
|
9ffc039254
|
Fix logo aliasing
CURA-6044
|
2018-12-20 14:01:12 +01:00 |
|
ChrisTerBeke
|
2f92f6ef50
|
Simplify checking if cloud or network printer, small fixes
|
2018-12-20 13:45:59 +01:00 |
|
ChrisTerBeke
|
0edeb11a78
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2018-12-20 13:14:24 +01:00 |
|
Jaime van Kessel
|
36efa171c6
|
Add a bit more logging to the authorization service
|
2018-12-20 11:31:01 +01:00 |
|
Jaime van Kessel
|
881e98c642
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2018-12-20 11:09:32 +01:00 |
|
Jaime van Kessel
|
dc473dc78d
|
Add missing typing for setting visibility preset model
|
2018-12-20 11:09:02 +01:00 |
|
Lipu Fei
|
68372aff60
|
Use MaterialManager in SendMaterialJob
CURA-6035
|
2018-12-20 10:45:40 +01:00 |
|
Lipu Fei
|
d93e19d530
|
Add getAllMaterialGroups()
CURA-6035
|
2018-12-20 10:45:05 +01:00 |
|
Remco Burema
|
481438d419
|
Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0
|
2018-12-20 09:54:21 +01:00 |
|
Remco Burema
|
a9f4b70b5c
|
Emit 'number of extruders changed' signal after add machine. [CURA-6045]
|
2018-12-20 09:53:58 +01:00 |
|
Jaime van Kessel
|
8bff0d17e8
|
Prevent the backend attempting to reslice everytime a preference changed
|
2018-12-20 09:43:01 +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
|
f5150a7c89
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2018-12-19 16:24:31 +01:00 |
|
Aleksei S
|
d891d30ab8
|
The Cura logo in left top corner is not displayed properly.
CURA-6044
|
2018-12-19 15:51:32 +01:00 |
|
Aleksei S
|
3953c7bb3a
|
Added Tooltip alignment
CURA-6004
|
2018-12-19 14:24:02 +01:00 |
|
ChrisTerBeke
|
21cde5535a
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2018-12-19 14:15:19 +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 |
|
Jaime van Kessel
|
d33cb6dfe9
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2018-12-19 14:09:32 +01:00 |
|
Jaime van Kessel
|
f2719ef582
|
Fix identation for postProcessing plugin settings
CURA-6043
|
2018-12-19 14:09:07 +01:00 |
|
Ghostkeeper
|
c0835f3a2f
|
Code style
Just something I boyscouted while working on something else.
|
2018-12-19 14:02:17 +01:00 |
|
Ghostkeeper
|
a5134001e9
|
Sort unique printer types
So that they appear in a consistent order everywhere.
|
2018-12-19 14:02:08 +01:00 |
|
Jaime van Kessel
|
9e867f8077
|
Fix the codestyle and cleanup the QML a bit
CURA-6043
|
2018-12-19 13:53:34 +01:00 |
|
Jaime van Kessel
|
08c736f770
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2018-12-19 13:31:06 +01:00 |
|
Jaime van Kessel
|
9acaf9abd7
|
Disable dropping of files into cura when monitor stage is active.
CURA-6038
|
2018-12-19 13:30:25 +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
|
773190bee1
|
Fix code style
Add space between binary operator.
Contributes to CURA-6005.
|
2018-12-19 12:53:41 +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
|
c4a8545c45
|
Add final cloud connected icon to printer selector
|
2018-12-19 12:05:07 +01:00 |
|
Simon Edwards
|
94ad0a81a2
|
Merge pull request #5018 from Ultimaker/add_keyboard_navigation_for_printer_carousel
Add keyboard navigation for printer carousel
|
2018-12-19 12:01:51 +01:00 |
|
ChrisTerBeke
|
1486ae87a3
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2018-12-19 11:59:48 +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 |
|
Ghostkeeper
|
56d0a52fac
|
Documentation and code style
|
2018-12-19 11:51:46 +01:00 |
|
ChrisTerBeke
|
80d2a78463
|
Fix optional type for output device
|
2018-12-19 11:47:41 +01:00 |
|
ChrisTerBeke
|
112950f003
|
Remove unused import
|
2018-12-19 11:45:36 +01:00 |
|
ChrisTerBeke
|
eb1bde0516
|
Remove Q_ENUMS for connection type, not used in QML anymore
|
2018-12-19 11:42:17 +01:00 |
|
ChrisTerBeke
|
1b356a3219
|
Move cloud connection check logic to Python
|
2018-12-19 11:41: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
|
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 |
|
Diego Prado Gesto
|
382286509f
|
Change the buildplate information to use a reusable component
Boy scouting.
Contributes to CURA-6025.
|
2018-12-19 09:49:12 +01:00 |
|
Ghostkeeper
|
de8106eb95
|
Merge branch '4.0' of ssh://github.com/Ultimaker/Cura into 4.0
|
2018-12-19 09:41:52 +01:00 |
|
Ghostkeeper
|
75d1d563ba
|
Merge branch 'fix_machine_settings_dialog' into 4.0
|
2018-12-19 09:41:43 +01:00 |
|
Diego Prado Gesto
|
6987d5ff78
|
Add a radius to the printer type label
|
2018-12-19 09:33:46 +01:00 |
|
Diego Prado Gesto
|
17cddac024
|
Merge branch '4.0' into CURA-6004_missing_tooltips
|
2018-12-19 09:03:31 +01:00 |
|
ChrisTerBeke
|
b66047c7d1
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2018-12-18 17:43:28 +01:00 |
|