3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
21633 commits 313 branches 275 tags 718 MiB
Commit graph

21633 commits

This branch
This branch
All branches
Author SHA1 Message Date
Remco Burema
25d76aee5a Workaround: Make the type-checker understand what's going on. 2019-10-18 14:46:44 +02:00
Remco Burema
270cb67480 Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-10-18 14:01:20 +02:00
Remco Burema
15bdf0fa1c Change the description of 'Initial Bottom Layers'. 
part of CURA-5918
 2019-10-18 14:00:16 +02:00
Remco Burema
1885dddf45 Merge branch 'feat_open_top_bottom' of https://github.com/BagelOrb/Cura into BagelOrb-feat_open_top_bottom 2019-10-18 12:55:52 +02:00
Jaime van Kessel
41dbf51e36
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-18 12:00:03 +02:00
Jaime van Kessel
c7a6fa4a00
Remove fixed override of prime tower position 
Now it uses the calculated value from fdm_printer, which is way smarter about it
 2019-10-18 11:59:21 +02:00
Ghostkeeper
d0c760d48b
Merge branch 'mb-per-object-setting-check-speedup' of https://github.com/smartavionics/Cura into smartavionics-mb-per-object-setting-check-speedup 2019-10-18 11:27:29 +02:00
Jaime van Kessel
6de7437626
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-18 10:51:37 +02:00
Jaime van Kessel
0aa2a4994c
Merge branch 'feature_restore_window_geometry' of https://github.com/fieldOfView/Cura 2019-10-18 10:45:28 +02:00
Ghostkeeper
84c9b28bb2
Move maximum resolution itself out of experimental as well 
This was forgotten accidentally, it seems.
 2019-10-18 00:07:43 +02:00
Mark Burton
82bd89991e Improve code style. 2019-10-17 16:43:07 +01:00
Mark Burton
f3f9a2393f Return early from _checkStackForErrors() if top container is empty. 2019-10-17 09:21:24 +01:00
Ghostkeeper
ad5fae5b66
Only allow optimising infill travels when combing is enabled 
That's the only time when it will have any effect, since the only thing this does is to calculate the distance to the next infill line better if the nozzle has to make a detour due to combing.
 2019-10-17 01:29:24 +02:00
Ghostkeeper
ad2077b76b
Merge branch 'CURA-6801_remove_quality_manager' 2019-10-16 16:18:53 +02:00
Remco Burema
f30f157736
Merge pull request #6504 from Ultimaker/CURA-6864_add_s5_intents 
Add UMS5 intent profiles
 2019-10-16 14:56:21 +02:00
Ghostkeeper
9b836d95d9
Remove quality, variant and material manager 
We don't use them any more and they are deprecated.

Removing them removes a lot of maintenance.

Contributes to issue CURA-6801.
 2019-10-16 13:00:38 +02:00
Lipu Fei
86ff7443cf Fix QML undefined errors 2019-10-16 10:36:36 +02:00
Nino van Hooff
ac8a7d4aeb Add whitespace between plugin name and licence string in license dialog 2019-10-16 09:44:09 +02:00
Lipu Fei
ae6f0eb77e Re-fix quality model update 
CURA-6883
 2019-10-15 15:55:21 +02:00
Lipu Fei
d350c9e3d9 Update quality and intent models when extruders get changed 
CURA-6894
 2019-10-15 15:53:55 +02:00
Ghostkeeper
f93f26444b
Revert "Fix QualityManagementModel update" 
This reverts commit fe8b7a48e6.

This commit caused Cura to crash when creating a custom quality profile.

Contributes to issue CURA-6883.
 2019-10-15 15:33:41 +02:00
Ghostkeeper
c875252b53
Fix some mistakes indicated by PyCharm's linting 2019-10-15 15:27:58 +02:00
Lipu Fei
59fa73448a Fix material diameter change 
CURA-6868
 2019-10-15 15:03:35 +02:00
Lipu Fei
d105150f53
Merge pull request #6533 from Ultimaker/CURA-6863_duplicated_material_oddness 
CURA-6863 duplicated material oddness
 2019-10-15 15:00:55 +02:00
Lipu Fei
0af8bd5e94 Fix merge conflicts 2019-10-15 15:00:03 +02:00
Nino van Hooff
e15952b25e Merge remote-tracking branch 'origin/master' 2019-10-15 14:37:52 +02:00
Nino van Hooff
845cab5573 Clarified comment for duplicating materials 2019-10-15 14:37:37 +02:00
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
43fa4337f9 Fix merge conflicts 2019-10-15 13:08:00 +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
Lipu Fei
cc64fb0a93 Fix variant handling in VariantNode 
CURA-6863
 2019-10-14 14:19:18 +02:00
Lipu Fei
dd8f6dc10e Fix ContainerTree reacting to duplicating materials 
CURA-6863
 2019-10-14 12:24:05 +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
Remco Burema
26a7de5a27 Fix boolean check. 
part of CURA-6863
 2019-10-14 11:02:58 +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