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 |
|
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 |
|
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 |
|
Ian Paschal
|
cb6e4ff2d1
|
Organize MonitorStage.qml better
|
2018-12-17 14:05:28 +01:00 |
|
Lipu Fei
|
6992fd2991
|
Update plugin versions to match package versions
CURA-6019
|
2018-12-17 13:03:21 +01:00 |
|
Ian Paschal
|
6178f9ddf6
|
Improve code style and line lengths
|
2018-12-17 11:49:09 +01:00 |
|
Ian Paschal
|
ff1a0e30f6
|
Code style & comments
|
2018-12-17 10:42:41 +01:00 |
|
Ian Paschal
|
77deabf6d4
|
Code style
|
2018-12-17 09:43:24 +01:00 |
|
Lipu Fei
|
efb832702b
|
Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages
Cura 6013 rate packages
|
2018-12-17 08:32:18 +01:00 |
|
Ghostkeeper
|
c235f339ae
|
Increment API version to 6
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.
Contributes to issue CURA-6019.
|
2018-12-14 17:29:02 +01:00 |
|
Ian Paschal
|
331cd730f1
|
Improve visual hint that side cards are not in focus
Contributes to CL-1151
|
2018-12-14 16:56:20 +01:00 |
|
Ian Paschal
|
e877b47e22
|
Disable printer cards which are not in focus
Contributes to CL-1151
|
2018-12-14 16:55:48 +01:00 |
|
Ian Paschal
|
6747fe3550
|
Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel
|
2018-12-14 16:31:47 +01:00 |
|
Ian Paschal
|
2789a0fdc4
|
Revert "Quick fix to prevent monitor stage from overlapping header"
This reverts commit 3766effa81dc111d70c0d7ff4563936ec92fc5c4.
|
2018-12-14 16:13:35 +01:00 |
|
Ian Paschal
|
3766effa81
|
Quick fix to prevent monitor stage from overlapping header
|
2018-12-14 16:04:31 +01:00 |
|
Ian Paschal
|
30168103b7
|
Update MonitorStage.qml
|
2018-12-14 15:47:36 +01:00 |
|
Ian Paschal
|
3bd5d141ab
|
Add easing and make animation less snappy and awesome
Contributes to CL-1151
|
2018-12-14 15:39:17 +01:00 |
|
Ian Paschal
|
2f6a274c0e
|
Small style improvements
Contributes to CL-1151
|
2018-12-14 15:27:55 +01:00 |
|
Lipu Fei
|
ae695b77e6
|
Add native rendering for QML Label
CURA-6013
|
2018-12-14 15:23:59 +01:00 |
|
Ian Paschal
|
b2ea597543
|
Fix button color
Contributes to CL-1151
|
2018-12-14 15:10:34 +01:00 |
|
Ian Paschal
|
5d0da580b9
|
Fix border colors
|
2018-12-14 15:04:22 +01:00 |
|
Ghostkeeper
|
2e835bf48d
|
Merge branch '4.0'
|
2018-12-14 15:02:30 +01:00 |
|
Ian Paschal
|
7fc5742b7f
|
Add monitor carousel
Contributes to CL-1151
|
2018-12-14 15:01:40 +01:00 |
|
Jaime van Kessel
|
b70a4ae0a2
|
Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0
|
2018-12-14 13:35:37 +01:00 |
|
Ghostkeeper
|
64e436f814
|
Merge branch '4.0'
|
2018-12-14 13:27:54 +01:00 |
|
Jaime van Kessel
|
6a3ac99551
|
Ensure that all icons use the same color from theme.
Also added some fixes for the dark theme
|
2018-12-14 11:59:22 +01:00 |
|
Lipu Fei
|
cd3a9e02d6
|
Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash
|
2018-12-14 11:45:51 +01:00 |
|
Jaime van Kessel
|
edd4f6e1fa
|
Fix some minor QML warnings
CURA-6013
|
2018-12-14 11:02:10 +01:00 |
|
Jaime van Kessel
|
7616f9c97d
|
Make hardcoded color themeable
CURA-6013
|
2018-12-14 10:59:59 +01:00 |
|
Jaime van Kessel
|
450f301c8c
|
Fix binding loop
CURA-6013
|
2018-12-14 10:56:13 +01:00 |
|
Jaime van Kessel
|
bb1bf14a01
|
Prevent rating when user is not logged in
CURA-6013
|
2018-12-14 10:46:31 +01:00 |
|
Ghostkeeper
|
bb45680b98
|
Merge branch '4.0'
|
2018-12-13 16:49:57 +01:00 |
|
Ghostkeeper
|
3f3cd5e334
|
Remove broken load of PrepareSidebar.qml
This file no longer exists. Loading it gives a warning.
|
2018-12-13 16:32:49 +01:00 |
|
Lipu Fei
|
3225512851
|
Fix typing
CURA-6013
|
2018-12-13 15:48:06 +01:00 |
|
Diego Prado Gesto
|
aa2fa371c4
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2018-12-13 14:32:28 +01:00 |
|
Diego Prado Gesto
|
17f0c12858
|
Make the middle component to have zero width if there is no component to
fill the gap.
Contributes to CURA-6020.
|
2018-12-13 14:31:34 +01:00 |
|
Lipu Fei
|
620790ae3d
|
Reduce the creations of ExtrudersModels
CURA-6015
|
2018-12-13 14:12:23 +01:00 |
|
Lipu Fei
|
2cf80b4578
|
Remove unused simpleNames flag
CURA-6015
|
2018-12-13 14:12:04 +01:00 |
|
Jaime van Kessel
|
b64882bb1e
|
Merge branch 'quit_cura_button' of github.com:Ultimaker/Cura into 4.0
|
2018-12-13 13:23:47 +01:00 |
|
Diego Prado Gesto
|
121af7ad60
|
Reuse the primary button in the toolbox for the "Quit Cura" button
|
2018-12-13 09:41:07 +01:00 |
|
Diego Prado Gesto
|
635115a879
|
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu
Fix preview stage menu
|
2018-12-13 09:32:01 +01:00 |
|
Jaime van Kessel
|
901c19e270
|
Prevent QML warning
CURA-6013
|
2018-12-12 11:52:04 +01:00 |
|
Jaime van Kessel
|
e30ca20c54
|
Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages
|
2018-12-12 11:50:26 +01:00 |
|