21576 Commits

Author SHA1 Message Date
Jaime van Kessel
bba43fafcc
Remove another unused signal 2019-10-11 14:35:44 +02:00
Jaime van Kessel
85859f0b1b
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-11 14:33:26 +02:00
Jaime van Kessel
be675d9343
Remove unused signal 2019-10-11 14:33:08 +02:00
Jaime van Kessel
a91b35c2ce
Merge pull request #6518 from photodude/patch-1
Overwrite prime_tower_position_* use value not default_value
2019-10-11 11:46:27 +02:00
Jaime van Kessel
2860512e96
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-11 11:04:54 +02:00
Jaime van Kessel
05a6c9c3cf
Make code a bit smarter about reusing ExtruderConfigurationModels
This prevents a lot of unneeded signal noise
2019-10-11 11:04:16 +02:00
Lipu Fei
6ae2ddacf5
Merge pull request #6515 from Ultimaker/CURA-6872_crash_changing_material_material_disabled_extruder
Prevent changing material / variant of disabled extruder
2019-10-11 10:04:11 +02:00
Walt Sorensen
faf50a301c
Overwrite prime_tower_position_* value not default_value
The default value here would not be used. Override must be `value` not `default_value` solves #6491 for BIBO but other printers may also be affected by #6491.
2019-10-10 10:09:49 -06:00
Ghostkeeper
7b2037fd47
Fix code style 2019-10-10 14:30:39 +02:00
Ghostkeeper
94f1749d58
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-10-10 13:53:40 +02:00
Ghostkeeper
b611126c00
Merge branch 'master' of https://github.com/FiCacador/Cura into FiCacador-master 2019-10-10 13:52:13 +02:00
Jaime van Kessel
ee25c4b94c
Merge branch 'CURA-6873_fix_um2_crash' of github.com:Ultimaker/Cura 2019-10-10 13:32:05 +02:00
Jaime van Kessel
07a20e131a
Prevent changing material / variant of disabled extruder
It is disabled, so changing it's material / variant doesn't make that much sense...

CURA-6872
2019-10-10 13:03:39 +02:00
Jaime van Kessel
ec4817db87
Fix crash when syncing with configuration that has no printcores active
CURA-6826
2019-10-10 09:55:17 +02:00
Nino van Hooff
d60b26db15 None-check for material diameter.
Fixes a crash for materials which don't have that metadata-entry,
such as an empty material (UM2)

CURA-6873
2019-10-10 09:27:23 +02:00
Lipu Fei
44cb810c85 If None crash
CURA-6869
2019-10-09 22:28:58 +02:00
Jaime van Kessel
cc9ec6ee49
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-09 17:12:42 +02:00
Jaime van Kessel
ed6539812e
Ensure that all material profiles get metadata updates
CURA-6868
2019-10-09 17:12:06 +02:00
Lipu Fei
e5b90ee306 Fix is_experimental flag update
CURA-6869
2019-10-09 12:52:49 +02:00
FiCacador
9158857477
Reverse Y axis
When an AMF file was imported, the Y axis was reversed, creating a mirrored object. This reverses the Y axis so the object is correctly imported.
2019-10-09 01:56:48 +01:00
Jaime van Kessel
cadc145008
Prevent infinite recursion in material page if it could not be found 2019-10-08 16:49:54 +02:00
Jaime van Kessel
987ccd28ba
Merge branch 'feature_intent' of github.com:Ultimaker/Cura 2019-10-08 16:23:03 +02:00
Jaime van Kessel
11f9992ebb
Merge pull request #6473 from Ultimaker/CURA-6632_intent_in_stats
CURA-6632 Add intent into stats
2019-10-08 16:19:19 +02:00
Lipu Fei
fb368a4788 Remove MachineManager.activeVariantNames
CURA-6865
2019-10-08 15:16:27 +02:00
Lipu Fei
570dfdab4b Fix project saving summary
CURA-6865
2019-10-08 15:15:13 +02:00
Lipu Fei
28466f7345 Elide long quality name
CURA-6862
2019-10-08 14:33:16 +02:00
Jaime van Kessel
23469948f6
Fix translation mistake in a message 2019-10-08 13:58:31 +02:00
Ghostkeeper
cf14fa6820
Merge branch 'feature_intent'
Here we go!

Contributes to issue CURA-6864.
2019-10-08 13:17:54 +02:00
Ghostkeeper
4edffa4a21
Temporarily remove S5 intent profiles
Ultimaker's marketing department is not able to explain why users would want to print more accurately, apparently, so we need to remove these.

Contributes to issue CURA-6864.
2019-10-08 13:16:38 +02:00
Ghostkeeper
c6d5f3ecf2
Remove temporary profiles to test with
They are no longer needed.

Contributes to issue CURA-6864.
2019-10-08 13:15:04 +02:00
Ghostkeeper
f8449796c9
Reset the camera origin when uninverting zoom direction
If zoom-to-cursor has been activated the camera origin will end up behind the camera. This resets it.

Fixes #6490.
2019-10-08 13:06:23 +02:00
Ghostkeeper
44a59a7f3b
Fix typing
Discovered during work on CURA-6793.
2019-10-08 12:44:10 +02:00
Remco Burema
6ed2b79166 Rename 'First Layer Speed' which is about small features. 2019-10-08 11:24:29 +02:00
Jaime van Kessel
17ce0f5eb1
Remove unused imports 2019-10-08 10:59:37 +02:00
Jaime van Kessel
58fec04650
Don't emit a globalcontainer changed signal when only the name changed
Apart form it being way to agressive (and thus, slowing things down), it
also caused a re-slice to be done when a printer was connected with another printer.
2019-10-08 10:53:58 +02:00
Ghostkeeper
c7ba02bdfb
Only show support interface angles settings if support is enabled 2019-10-08 10:38:20 +02:00
Jaime van Kessel
e6d19d9244
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-08 10:37:40 +02:00
Jaime van Kessel
cfd577f235
Remove buildplate info from workspace save dialog 2019-10-08 10:37:19 +02:00
Lipu Fei
8940097265 Separate black and grey text for quality menu
CURA-6846
2019-10-07 21:35:31 +02:00
Lipu Fei
32747d2abe Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-07 21:20:54 +02:00
Lipu Fei
01345650e7 Use more meaning ID
CURA-6834
2019-10-07 21:14:05 +02:00
Lipu Fei
551c9fe682 Update SliceInfo example
CURA-6632
2019-10-07 21:11:42 +02:00
Lipu Fei
74e7de1b54 Add intent into stats
CURA-6632
2019-10-07 21:11:40 +02:00
Ghostkeeper
d1f9245d26
Move Maximum Resolution and Maximum Deviation out of experimental
Yes, it does comply to our Definition of Not Experimental. And I asked.
2019-10-07 17:17:43 +02:00
Jaime van Kessel
cb526f0f31
Merge branch 'CURA-6706_intents_on_quality_mgr_page' of github.com:Ultimaker/Cura into feature_intent 2019-10-07 16:14:24 +02:00
Ghostkeeper
225d1a2ac1
Allow minimum circumference to be 0
It should just not filter then.
2019-10-07 15:25:49 +02:00
Lipu Fei
497648ffe7 Fix min/max X/Y QML value bindings
CURA-6834
2019-10-07 14:06:21 +02:00
Lipu Fei
121315cbf2
Merge pull request #6456 from Ultimaker/CURA-6824
Consider user preference when opening project files from cli.
2019-10-07 13:46:44 +02:00
Lipu Fei
757b02ec42 Simply and fix quality name generation
CURA-6846
2019-10-07 13:30:33 +02:00
Lipu Fei
e4fa89ea4b Simplify quality display name (label name) generation
CURA-6706
2019-10-07 13:28:12 +02:00