18466 Commits

Author SHA1 Message Date
Jaime van Kessel
face8d4799 Moved logic of isDefinitionvalid to it's own function
This should make it easier in the future to add checks for the extruders as well
2019-02-13 14:11:46 +01:00
Jaime van Kessel
9b76124d11 Ensured that the validateDefinitionContainer checks a single definition per test 2019-02-13 14:02:38 +01:00
Jaime van Kessel
f35ad5cf83 Merge branch 'CURA-5977_test_definition_container' of github.com:Ultimaker/Cura 2019-02-13 14:02:09 +01:00
Ghostkeeper
5b9fb20b9a
Remove unused imports 2019-02-12 11:48:23 +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
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
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
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
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile
CURA-5916
2019-02-07 16:08:50 +01:00
Jaime van Kessel
eb6f65d4ec Add print-guideline icon
CURA-5916
2019-02-07 15:19:46 +01:00
Jaime van Kessel
e869829f10 Updated the icon so it also works in the dark theme 2019-02-07 15:17:07 +01:00
Lipu Fei
40ca03fb5d
Merge pull request #5040 from Ultimaker/CURA-5864_prime_tower_brim_enable
Cura 5864 prime tower brim enable
2019-02-07 15:09:58 +01:00
Lipu Fei
d6abad3f27 Merge remote-tracking branch 'origin/master' into CURA-5864_prime_tower_brim_enable 2019-02-07 14:47:11 +01:00
Lipu Fei
e5071eac5b Fix typing 2019-02-07 14:31:40 +01:00
Lipu Fei
47d531e2c5 Fix typing 2019-02-07 14:30:10 +01:00
Lipu Fei
6e40e4a831 Remove unused things 2019-02-07 14:29:59 +01:00
Jaime van Kessel
c15089cd59 Some minor cleanup of the QML
CURA-5916
2019-02-07 14:13:00 +01:00
Ian Paschal
2b6bab9552 Re-enable firmware check
Contributes to CL-1222
2019-02-06 16:42:26 +01:00
Remco Burema
da6ff7c5a9 Merge branch 'master' into temp_CURA-5864 2019-02-06 16:23:30 +01:00
Remco Burema
3a94745667 Make sliders reappear in simulation-view. [CURA-6183] 2019-02-06 16:01:01 +01:00
Ian Paschal
fcb52dd1cf Show cloud flow pop-up if machine is removed from cloud
Contributes to CL-1222
2019-02-06 14:26:11 +01:00
Ian Paschal
162fdad4e4 Improve conditions for starting cloud flow
Contributes to CL-1222
2019-02-06 13:58:33 +01:00