Lipu Fei
43fa4337f9
Fix merge conflicts
2019-10-15 13:08:00 +02:00
Remco Burema
fde4804a58
Merge branch 'master' into CURA-6862_truncate_profile_names
2019-10-15 11:48:08 +02:00
Remco Burema
71701f15cf
Remove function to reintroduce binding.
...
Also force max width to integer value and comment why there is a plain value like 0.7 in the code.
part of CURA-6862
2019-10-15 11:38:51 +02:00
Remco Burema
26e578b059
Merge branch 'master' of https://github.com/Ultimaker/Cura
2019-10-15 10:46:46 +02:00
Nino van Hooff
ca21268a12
Elide the profile text in the middle for the PrintSetupSelector.
...
This makes sure that at least some part of the name and some part of the
variant details (qualityy, diameter) is visible
CURA-6862
2019-10-15 10:26:52 +02:00
Ghostkeeper
096b6431c5
Fix typos in g-code comments
2019-10-14 16:01:40 +02:00
Lipu Fei
8f66809159
Always show custom qualities
...
CURA-6882
2019-10-14 14:34:35 +02:00
Lipu Fei
8b913f4009
Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness
2019-10-14 12:23:49 +02:00
Nino van Hooff
279d5671d8
Cleanup CustomPrintSetup.qml
...
CURA-6862
2019-10-14 12:14:31 +02:00
Nino van Hooff
c147174668
Limit profile name to 70% of available width for CustomPrintSetup
...
This leaves 30% for the variant detail info
CURA-6862
2019-10-14 11:05:24 +02:00
Ghostkeeper
4cb59b5454
Fix overriding of prime tower position
...
We had changed it for all printers back when we changed the prime tower position to a formula, but since then we've been getting new printer definitions that were made from templates floating around with the old structure.
We should really have an automated test for this.
Discovered during review of #6518 .
2019-10-14 11:02:43 +02:00
Remco Burema
09dc6ae44a
Scouting: Try not to spam signals or errors as much.
...
nominally part of CURA-6863
2019-10-14 01:03:41 +02:00
Remco Burema
4277ede64f
Fix 1/2 of the duplication material bug.
...
The material is added multiple times to the variant nodes, and overwriting it with the eventual right one was going wrong.
This does not solve it entirely (because the less specific one still ends up selected _initially_ because it gets added first, and the order can't be guaranteed.
part of CURA-6863
2019-10-14 01:01:19 +02:00
KOUBeMT
fbf583b577
Update strateo3d.def.json
2019-10-11 15:27:46 +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
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
Nino van Hooff
c8d65e86f1
Truncate/elide/ellipsize the material name in Preferences
...
if it doesn't fit it's parent
CURA-6862
2019-10-10 15:36:14 +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
Remco Burema
25db711adc
Fix tooltips absorbed mouseclicks for view-buttons.
2019-10-10 12:57:27 +02:00
Remco Burema
902b9f278e
Add tooltips for view orientation buttons.
2019-10-09 15:32:39 +02: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
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
Ghostkeeper
dcd782418f
Add UMS5 intent profiles
...
Ultimaker's marketing department is so far unable to explain why users of the Ultimaker S5 would want to print more accurately. So we wait with adding these until they have their story straight.
Contributes to issue CURA-6864.
2019-10-08 13:40:12 +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
BeamUp 3D
8da6fbd49d
Delete .gitignore
2019-10-08 14:00:20 +03:00
BeamUp 3D
e39c7edefa
Add BeamUp S quality files
2019-10-08 13:59:34 +03:00
BeamUp 3D
0d0de6d729
Create BeamUp S quality folder
2019-10-08 12:42:55 +03:00
Remco Burema
6ed2b79166
Rename 'First Layer Speed' which is about small features.
2019-10-08 11:24:29 +02:00
BeamUp 3D
07e96042dc
Add BeamUp S platform
2019-10-08 12:20:21 +03:00
BeamUp 3D
7ed89c45c1
Add BeamUp S extruder
2019-10-08 12:18:52 +03:00
BeamUp 3D
3d755066a0
Add BeamUp S definition
2019-10-08 12:10:42 +03: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
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
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
Nino van Hooff
11d0462c7a
Fix recent files python function calls
2019-10-07 10:44:30 +02:00
Lipu Fei
c42feae11c
Make intents work on quality management page
...
CURA-6706
2019-10-07 09:22:47 +02:00
Ghostkeeper
e5c0812acc
Fix scrolling through profiles on Qt5.12+
...
Contributes to issue CURA-6843.
2019-10-04 16:22:34 +02:00
THeijmans
1cfcbf0b53
Clean up intent profiles
...
For when infill and/or wall speeds are not formula based in the underlying quality profile.
2019-10-04 15:05:52 +02:00