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

29193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Remco Burema
188b63703b
Merge pull request #12531 from Ultimaker/CURA-8555_link_ufp_to_3mf_in_digital_library 
Cura 8555 link ufp to 3mf in digital library
 2022-06-15 15:16:11 +02:00
Rijk van Manen
d4095e7e1d set correct nozzle tip outer diameter 
This is the size of the ruby. PP-116
 2022-06-15 15:12:34 +02:00
Rijk van Manen
311b5e94ce add machine nozzle tip size 
PP-116
 2022-06-15 14:58:34 +02:00
Rijk van Manen
5db8567bff cleanup variant profile 
In the ppCCB we decided to clean up to DD variant profiles, since we plan to do that with all variant profiles in the future. PP-116
 2022-06-15 14:58:16 +02:00
Ghostkeeper
bb058d18cb
Merge branch 'main' of github.com:Ultimaker/Cura 2022-06-15 14:40:42 +02:00
Ghostkeeper
20607b219a
Merge branch 'split-removable-output-write-function' of https://github.com/zxc8027/Cura into zxc8027-split-removable-output-write-function 2022-06-15 14:37:39 +02:00
Remco Burema
a82b90fd96
Merge pull request #12488 from Ultimaker/PP-108_Improved_support_settings 
PP-108 improved support settings
 2022-06-15 14:24:09 +02:00
j.delarago
4e80d170d1 Add logs for debugging 
CURA-8610
 2022-06-15 14:09:05 +02:00
Ghostkeeper
68fde8d051
Merge branch 'PP-166-DD-core-variant-files' 2022-06-15 14:08:13 +02:00
Ghostkeeper
4b6995bf24
Correct description for Enable Travel Jerk 
Done as a 5 minute fix.
 2022-06-15 14:04:22 +02:00
c.lamboo
854607a725 Provide source_file_id with print file 
Had to implement this a bit differently as stated in the ticket. This field is returned when uploading the project file.

Logic needed a bit of a change as the new behavior dictates a sequence (we can only upload the print file after the project file is uploaded, and we know the correct `file_id`/`source_file_id`) where before these two api calls were done in parallel.

CURA-8555
 2022-06-15 13:36:34 +02:00
c.lamboo
f67d086182 Boyscouting modern python typing 
CURA-8555
 2022-06-15 13:27:47 +02:00
j.delarago
5d0e4238d5 Use os.path.join instead of appending a "/" since this is os specific. 
Remove possible bad conversion to str for path.
 2022-06-15 13:26:29 +02:00