GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-10 05:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,155 Commits 290 Branches 260 Tags
Commit Graph

29155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
a17b68b17d
Merge branch 'CURA-9420_translations_5.1' 2022-06-21 17:56:43 +02:00
Ghostkeeper
5b2a482916
Add quick script to rename Cura 1 tags 
Reasons are documented in the file.
 2022-06-21 14:51:09 +02:00
Ghostkeeper
1142768d59
Fix headers for translation files 
And update their dates too.

Contributes to issue CURA-9420.
 2022-06-21 13:12:21 +02:00
Ghostkeeper
7898d8e5bf
Update translation files from updated templates 
This brings the new translated strings into the files for each language.

Contributes to issue CURA-9420.
 2022-06-21 12:56:04 +02:00
Ghostkeeper
de968d6c16
Update translation templates for Cura 5.1 
These are the new translations for 5.1.

Contributes to issue CURA-9420.
 2022-06-21 12:54:08 +02:00
Jaime van Kessel
58651b6b97 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-21 11:00:06 +02:00
Jaime van Kessel
52ea80f6c9 Fix the font for searchbars being styled correctly 
By setting the font.italic to true, we actually reset the entire font.

Fixes #12565
 2022-06-21 10:58:53 +02:00
Ghostkeeper
dffb0fc744
Merge branch '5.1' into main 2022-06-20 11:04:33 +02:00
Ghostkeeper
8970f46154
Better path to packages.json in the 3MF file 
Let's put it in the Cura directory with the rest of such files, as to not muddy the 3MF file with all sorts of directories that are not known to other consumers.

Contributes to issue CURA-9413.
 2022-06-20 11:04:14 +02:00
Ghostkeeper
b3394a240c
Merge branch '5.1' into main 2022-06-20 10:48:41 +02:00
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing 
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
 2022-06-20 10:48:13 +02:00
Jaime van Kessel
f474381425 Fix multiple issues with profiles 
That's what you get from not having tests running remote.
 2022-06-17 16:06:24 +02:00
Jaime van Kessel
e38059b7c0 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:58:11 +02:00
Jaime van Kessel
3101f2aea4 Remove filter_out_tiny_gaps from definitions 
This setting doesn't exist anymore.
 2022-06-17 15:57:40 +02:00
Jaime van Kessel
c6a3fb3ae4 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:54:47 +02:00
Jaime van Kessel
3689c097f3 Re-add accidentally removed setting 2022-06-17 15:54:23 +02:00
Jaime van Kessel
85eb0fedcd Fix Convex hull decorator tests 2022-06-17 15:50:04 +02:00
Jaime van Kessel
6956a4ad37 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:37:56 +02:00
Jaime van Kessel
f82e49e2dd Merge branch 'fix_material_diameter_profiles' of github.com:fieldOfView/Cura into 5.1 2022-06-17 15:35:32 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage 
This only needs to happen in code that uses PyQt, not in qml code
 2022-06-17 15:26:30 +02:00
Jaime van Kessel
d05417f7f0 Remove duplicated code 
CURA-9352
 2022-06-17 15:22:33 +02:00
Jaime van Kessel
3514c01b25 Remove duplicated code 
CURA-9352
 2022-06-17 15:21:30 +02:00
Casper Lamboo
50a3511496
Merge pull request #12542 from Ultimaker/CURA-8849_intent_selection_fixes 
[CURA-8849] Intent selection fixes
 2022-06-16 15:55:32 +02:00
j.delarago
9dff733345 Remove todos that are no longer applicable 
Remove debug print statement

CURA-9321
 2022-06-16 15:32:33 +02:00
j.delarago
1a464051d4 On initial startup, when assigning your first printer the ActiveIntentQualitiesModel.py would not be updated. Causing an error unsupported configuration to show. 
Fixed by updating the model when the globalContainer is changed as well.

CURA-8849
 2022-06-16 14:27:13 +02:00
j.delarago
cc58b362fc Add text wrapping for very long custom profile names. 
CURA-8849
 2022-06-16 14:19:39 +02:00
j.delarago
0fb2b46677 Intent button was showing when only a single intent is available. 
This was caused by visible being overridden.

CURA-8849
 2022-06-16 14:05:39 +02:00
j.delarago
1e0236e317 Remove left margins which don't align with the intended design. 
CURA-8849
 2022-06-16 13:56:46 +02:00
j.delarago
689547f125 We are using recommendedResolutionSelector._previousResolution to see if the resolution had changed before highlighting the resolution selector. This updates when intents change but not when qualities change. 
I tried updating when the qualities change but this was updating before this line
if(recommendedResolutionSelector._previousResolution !== Cura.MachineManager.activeQualityType)
which caused this always to resolve as true

The solution was to update _previousResolution after we select an item in the drop down.

CURA-8849
 2022-06-16 13:49:30 +02:00
j.delarago
1e5f6bce72 Increase margins on warning to match design 
CURA-8849
 2022-06-16 13:23:50 +02:00
j.delarago
7d8fdf8bdd Items in intent selection settings column were not filling width, the result of this was any item with more than one child would have these children squished together. 
Fix is to have the children fill their width

CURA-8849
 2022-06-16 13:12:36 +02:00
Joey de l'Arago
88168bc0e1
Merge pull request #12532 from Ultimaker/PP-116_clean-up-DD-variant-profile 
Pp 166 clean up dd variant profile
 2022-06-16 11:08:50 +02:00
Jaime van Kessel
ac32f3b625
Merge pull request #12530 from Ultimaker/CURA-8610_save_required_packages_metadata 
[CURA-8610] save required packages metadata
 2022-06-16 10:47:06 +02:00
j.delarago
8c92ebfccd Add missing import 
CURA-8849
 2022-06-16 10:41:06 +02:00
Jaime van Kessel
d30afb6647
Merge pull request #12534 from StuSerious/main 
Enhance CITATION.cff
 2022-06-16 09:29:10 +02:00
Stefano Serioli
25a7c3e263
Merge branch 'Ultimaker:main' into main 2022-06-15 18:31:23 +02:00
StuSerious
a83daee8da update CITATION to latest version (.cff and Cura) 
this brings citation file format to 1.2 and Cura version to 5.0.0.

some other changes and important fields were also added.
 2022-06-15 18:30:11 +02:00
Casper Lamboo
dd76369b9a
Merge pull request #12528 from Ultimaker/CURA-8849 
[CURA-8849] Improve intent profile selection
 2022-06-15 18:24:18 +02:00
j.delarago
f9dda40409 Better typing 
CURA-8849
 2022-06-15 17:41:21 +02:00
j.delarago
6f8470167f Suggested changes 
CURA-8849
 2022-06-15 17:40:07 +02:00
Joey de l'Arago
142f1823b3
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:31:40 +02:00
Joey de l'Arago
b132b5c08c
Update cura/Machines/Models/IntentSelectionModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:59 +02:00
Joey de l'Arago
e47a2d1c99
Update cura/Machines/Models/IntentSelectionModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:26 +02:00
Joey de l'Arago
b4152d29d6
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:29:16 +02:00
Joey de l'Arago
87afb117d0
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:22 +02:00
Joey de l'Arago
760976159c
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:13 +02:00
Joey de l'Arago
caa0c255aa
Update cura/Machines/Models/ActiveIntentQualitiesModel.py 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-06-15 17:28:06 +02:00
j.delarago
cd34294914 Revert "disable travel_avoid_supports" 
This reverts commit 8f2dff712ec18046bf76211fa3a8dd7d20647d30.
 2022-06-15 17:19:03 +02:00
Jaime van Kessel
1a0b095f8d
Merge pull request #11721 from Haxk20/patch-1 
voron2_base.def.json: Do not limit travel speeds to 300mm/s
 2022-06-15 16:08:09 +02:00
j.delarago
8c2ac9f21e Remove excessive logs, make path search recursive for materials. 
CURA-8610
 2022-06-15 15:47:17 +02:00