18687 Commits

Author SHA1 Message Date
Aleksei Kvitinskii
22f7d30197 merged extruders and replace value with default_value 2019-02-12 21:13:53 +03:00
Remco Burema
a24dc00bc5 Arrange child-nodes (like blocker) with parents. [CURA-6120] 2019-02-12 18:08:17 +01:00
Jaime van Kessel
ebcdcb4987 Remove layer_height from um2+ extruder profiles.
I've also doublechecked if the type of these profiles matches up and updated them where needed.
2019-02-12 14:00:16 +01:00
Ian Paschal
aa454ea357 Use parseBool instead of "is True" and "is False"
Contributes to CL-1222
2019-02-12 12:18:29 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking
Contributes to CL-1165
2019-02-12 12:12:59 +01:00
Remco Burema
c6c0ed5f00 Fix sign-in size for cloud icon (and add for dark theme).
Co-authored-by: Yi-An Lai <y.lai@ultimaker.com>
2019-02-12 11:57:01 +01:00
Ghostkeeper
5b9fb20b9a
Remove unused imports 2019-02-12 11:48:23 +01:00
Remco Burema
c50fcf42c5 Fix crash on no output devices in list. 2019-02-12 11:39:03 +01:00
ValentinPitre
696289d348 add tizyx evy printer 2019-02-11 19:36:32 +01:00
Jaime van Kessel
ad8c269012
Merge pull request #5289 from ishchenko/patch-1
Fix Anycubic i3 Mega has_materials
2019-02-11 15:13:32 +01:00
Jaime van Kessel
ec5da1d210 Fix failing unit test 2019-02-11 13:30:32 +01:00
Ian Paschal
0e913044de Ensure pop-up is not shown if cloud connection is already configured
Contributes to CL-1222
2019-02-11 10:21:54 +01:00
ChrisTerBeke
14c361a297 Add comment to clarify usage of fallback date 2019-02-11 09:45:50 +01:00
Ghostkeeper
d2e1c47029
Use spaces instead of tabs
Yeah, or remove extraneous tabs at the end of a line.
2019-02-11 08:53:42 +01:00
Max Ishchenko
8e8bb93096
Fix #4867 2019-02-10 09:17:45 +03:00
ChrisTerBeke
a7071e2d3d
Fix unit tests 2019-02-08 22:53:12 +01:00
ChrisTerBeke
62c7ba5659
remove unused argument 2019-02-08 22:31:36 +01:00
ChrisTerBeke
4192c9e764
Fix typing issue 2019-02-08 22:30:31 +01:00
ChrisTerBeke
48c756b01d
Fixes for storing timestamp 2019-02-08 22:24:14 +01:00
ChrisTerBeke
05c4b6012e
Calculate expiry date to determine if token refresh is needed 2019-02-08 21:39:45 +01:00
ChrisTerBeke
9d6bd4b29a
Check access token before using it 2019-02-08 21:03:59 +01:00
Jaime van Kessel
93ff63ce6f Merge branch 'master' of github.com:Ultimaker/Cura 2019-02-08 17:38:31 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0' 2019-02-08 14:23:36 +01:00
Ghostkeeper
85607d0e68
Merge branch 'AddCC06PLAprofile' into 4.0 2019-02-08 14:23:11 +01:00
Ian Paschal
8807243108
Merge pull request #5286 from Ultimaker/CL-1222_cloud_flow_pop_up
CL-1222 Cloud flow pop-up (Finalize copy)
2019-02-08 14:09:53 +01:00
Ian Paschal
937dce591d Finalize copy
Contributes to CL-1222
2019-02-08 13:53:02 +01:00
Jaime van Kessel
afce462cfa Add test for creation of unique name 2019-02-08 13:35:50 +01:00
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up
CL-1222 Cloud flow pop up
2019-02-08 13:26:03 +01:00
Ghostkeeper
a67a721269
Also don't retract with spiralize in UM3
Similar to UMS5, we don't want to retract at layer change when spiralising.
2019-02-08 13:19:58 +01:00
Ian Paschal
0dfcaadc49 Typecheck improvements
Contributes to CL-1222
2019-02-08 13:13:26 +01:00
Ian Paschal
53e07eadd3 Allow for optional typing
Contributes to CL-1222
2019-02-08 13:03:10 +01:00
Ian Paschal
2d77792988 Add some typings
Contributes to CL-1222
2019-02-08 12:54:10 +01:00
Ghostkeeper
7080bc0dcc
Fix experimental label
We have a system for this nowadays.

Contributes to issue CURA-6196.
2019-02-08 12:03:08 +01:00
Ghostkeeper
473633de2c
Merge branch '4.0' 2019-02-08 11:28:06 +01:00
Ghostkeeper
1b29ff2b8a
Make authorisation error messages translatable
Because they weren't. Foreigners might not understand them.
2019-02-08 11:19:22 +01:00
Ghostkeeper
12b2154a96
Fix code style and documentation formatting 2019-02-08 11:10:43 +01:00
Ghostkeeper
eb3129815d
Fix some code style
Please, people, adhere to our code style.
2019-02-08 11:01:09 +01:00
Jaime van Kessel
a1d08dab69 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-08 10:51:08 +01:00
Ghostkeeper
2519ad311b
These are the settings that I consider to be worthy for any expert user
I decided not to put the prime tower brim in advanced because the rest of the advanced settings are still a bit more novice than that.

Contributes to issue CURA-6194.
2019-02-08 10:50:41 +01:00
Jaime van Kessel
91f0d76c8a Fix crash when user was logged in but there was no internet connection on boot 2019-02-08 10:50:17 +01:00
THeijmans
151c8919cd Upload CC06 PLA profiles for TPM
These are experimental for Ultimaker materials.
2019-02-08 10:42:43 +01:00
Ghostkeeper
0b85c3a1e9
Remove wireframe from expert settings
Nobody really uses it seriously as far as we know.

Contributes to issue CURA-6194.
2019-02-08 10:41:20 +01:00
Jaime van Kessel
43b81c70db Ensure that color for support extruder selector gets updated in all cases
CURA-6144
2019-02-08 10:32:54 +01:00
Ian Paschal
b77c41c5e6
Merge pull request #5279 from Ultimaker/CL-1237_fix_move_to_top
Cl 1237 fix move to top
2019-02-08 09:54:45 +01:00
Ghostkeeper
672271d525
Fix running automated tests on Python 3.6
This prevents the PyCapsule_GetPointer error.
2019-02-08 09:50:20 +01:00
Ian Paschal
5f0d9fc16a Merge remote-tracking branch 'origin/4.0' into CL-1237_fix_move_to_top 2019-02-08 09:41:41 +01:00
Ian Paschal
729f4c9d52 Revert "Fix line length"
This reverts commit 19f1a2f2d047f646c227e3fbb0d74f2cb7d57abd.
2019-02-08 09:40:56 +01:00
Ghostkeeper
506ce2e6e5
Merge branch 'CURA-5916-show-printing-guidelines-for-custom-material-section'
Contributes to issue CURA-5916.
2019-02-08 09:32:56 +01:00
Ian Paschal
19f1a2f2d0 Fix line length
Contributes to CL-1237
2019-02-08 09:23:38 +01:00
Diego Prado Gesto
b0cf5f25c6 Merge branch '4.0' 2019-02-07 17:36:44 +01:00