GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-25 02:44:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,596 Commits 295 Branches 268 Tags
Commit Graph

21596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
fe8b7a48e6 Fix QualityManagementModel update 
CURA-6883
 2019-10-15 14:23:50 +02:00
Lipu Fei
e5450a449c IntentManager should take into account disabled extruders 
CURA-6891
 2019-10-15 13:27:58 +02:00
Lipu Fei
36aab5d56b Fix removeMaterials() and optimization 
CURA-6886
 2019-10-15 13:04:57 +02:00
Remco Burema
9963c81294
Merge pull request #6537 from Ultimaker/CURA-6862_truncate_profile_names 
CURA-6862_truncate_profile_names
 2019-10-15 11:53:36 +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
Lipu Fei
84080b675b Fix tests 2019-10-15 08:29:53 +02:00
Lipu Fei
577365cf96 Fx containerAdded handling in VariantNode 
CURA-6889
 2019-10-15 08:20:25 +02:00
Ghostkeeper
096b6431c5
Fix typos in g-code comments 2019-10-14 16:01:40 +02:00
Lipu Fei
54f7892f2d Sort built-in qualities by layer height for all 
CURA-6883
 2019-10-14 15:25:30 +02:00
Lipu Fei
2e0fd21c60 Fix setVariantByName() 2019-10-14 14:47:43 +02:00
Lipu Fei
8f66809159 Always show custom qualities 
CURA-6882
 2019-10-14 14:34:35 +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
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
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
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
Remco Burema
25db711adc Fix tooltips absorbed mouseclicks for view-buttons. 2019-10-10 12:57:27 +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
Remco Burema
902b9f278e Add tooltips for view orientation buttons. 2019-10-09 15:32:39 +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