Jaime van Kessel
7fc4e6ddde
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-03 10:23:22 +01:00
Jaime van Kessel
195d39f698
Update the style of the postprocessing button
...
CURA-6043
2019-01-03 09:47:48 +01:00
Lipu Fei
ee72284616
Use appropriate log level
...
CURA-6035
2019-01-03 08:32:42 +01:00
Ghostkeeper
4177faa6ea
Fix font usage in installed plug-ins
...
Several different font sizes should be used here.
Contributes to issue CURA-6025.
2018-12-31 15:37:31 +01:00
Ghostkeeper
7ef8287e52
Fix theming of back button in Marketplace
...
Give it a bit more space for if the translated text is wider, and if it is wider also align it properly with the arrow.
Contributes to issue CURA-6025.
2018-12-31 15:33:37 +01:00
Ghostkeeper
30ab1a957f
Make headers of Marketplace large
...
As per the design.
Contributes to issue CURA-6025.
2018-12-31 15:18:50 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles
...
Contributes to issue CURA-6025.
2018-12-31 15:14:23 +01:00
Jaime van Kessel
e02fcd664c
Merge branch '4.0' of github.com:Ultimaker/Cura
2018-12-31 14:34:53 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu
...
Except the material manufacturer, which should remain default.
Contributes to issue CURA-6025.
2018-12-31 13:22:53 +01:00
Ghostkeeper
c333899d18
Fix reference to renamed file
2018-12-31 11:09:26 +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
Jaime van Kessel
c08339e191
Merge branch 'CURA-6033_unknown_material' of github.com:Ultimaker/Cura into 4.0
2018-12-31 10:33:01 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types
2018-12-28 15:51:54 +01:00
Ghostkeeper
265a1b3fa0
Add version upgrade plug-in for 4.0 to 4.1
...
This currently only updates the stack files, but all files have to be upgraded because of that stupid setting_version.
Contributes to issue CURA-5848.
2018-12-27 16:50:05 +01:00
Marijn Dee
12a4a5e9f5
Fixing the rest of the automatic test failures
2018-12-21 15:06:02 +01:00
ChrisTerBeke
64f5c4f263
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-21 13:33:16 +01:00
Ghostkeeper
d880194c8c
Merge branch '4.0'
2018-12-21 11:59:41 +01:00
Jaime van Kessel
7269065cca
Only clear the stored optimized layer data if the slice started
2018-12-21 11:54:11 +01:00
Ghostkeeper
8308e48c2d
Merge branch '4.0'
2018-12-21 11:51:04 +01:00
ChrisTerBeke
a86f253bf3
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-21 10:58:13 +01:00
Ghostkeeper
75fbdf2c94
Expand error message for cases when extruders are disabled
...
It is also unable to slice models that are on extruders that are disabled.
2018-12-21 10:40:37 +01:00
Marijn Dee
131211e604
Fixed the unit tests
2018-12-21 09:42:28 +01:00
Aleksei S
81a6531f47
Fix range slider label position in LayerSlider.qml.
2018-12-20 20:37:48 +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
bfd1debb8f
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-20 15:49: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
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
Lipu Fei
68372aff60
Use MaterialManager in SendMaterialJob
...
CURA-6035
2018-12-20 10:45:40 +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
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
f2719ef582
Fix identation for postProcessing plugin settings
...
CURA-6043
2018-12-19 14:09:07 +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
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
