Saumya Jain
b5940a54f4
fixing size of drop down
...
CURA-11700
2024-03-14 16:17:34 +01:00
Erwan MATHIEU
8308b640ca
Revert "Optimize overridden calculated settings computation"
...
This reverts commit 42b72f81bb16ffa6912eb96aed29a3fd3349af56.
2024-03-14 16:02:35 +01:00
Saumya Jain
b245cce4e6
Merge branch '5.7' into CURA-11700-trigger-area-for-selecting-machine
2024-03-14 13:40:07 +01:00
Saumya Jain
42261b67d7
Merge branch '5.7' into CURA-11715-save_as_type-for-3mf
2024-03-14 13:02:08 +01:00
Saumya Jain
73e4d78735
added limit mimetype for 3mf project and removed saving ucp as mesh writer
...
CURA-11715
2024-03-14 13:01:01 +01:00
Remco Burema
7013afae16
Merge pull request #18591 from Ultimaker/CURA-11701-profile-changes-to-unsupported
...
not clearing the current machinein case of UCP
2024-03-14 13:00:13 +01:00
Remco Burema
ea96c3512b
Merge pull request #18602 from wawanbreton/fix_get_user_profile
...
Do not get user profile by loading auth data
2024-03-14 12:48:04 +01:00
Saumya Jain
9604674c8b
Added Cura.MachineSelector in place of combobox
...
combobox seemed to be tampering with the mouse area of machineselector
CURA-11700
2024-03-14 11:45:15 +01:00
Erwan MATHIEU
85b60c1f28
Do not get user profile by loading auth data
2024-03-14 11:17:12 +01:00
Casper Lamboo
9f952b91c3
Merge pull request #18588 from Ultimaker/CURA-11721-load-ucp-improovement
...
placing Setting loaded from ucp on top before Suggested Profile setting
2024-03-14 09:43:38 +01:00
Paul Kuiper
72ef2334ca
Use the package_id that Bart used in the contributor portal.
...
PP-446
2024-03-13 16:48:23 +01:00
Paul Kuiper
49a111efab
Use the package_id that Bart used in the contributor portal.
...
PP-446
2024-03-13 16:45:49 +01:00
Erwan MATHIEU
e4b0a42681
Merge remote-tracking branch 'origin/5.7' into CURA-11475_low_performance_multiple_nozzles
2024-03-13 14:08:52 +01:00
Erwan MATHIEU
42b72f81bb
Optimize overridden calculated settings computation
...
Instead of getting all the settings and checking whether they have a user state, just take the settings from the user changes containers, which is way faster.
CURA-11475
2024-03-13 14:08:04 +01:00
Saumya Jain
e90cbcfa01
not clearing the current machinein case of UCP
...
because we don't want to write again the same thing.
CURA-11701
2024-03-13 13:38:46 +01:00
c.lamboo
f5877d3bce
Fix post processing plugin button alignment
...
This was caused by the label within the component spanning multiple lines, causing the height of the component to increase. Since the buttons were vertically aligned the positioning of these buttons are impacted.
CURA-11697
2024-03-13 12:00:32 +01:00
Saumya Jain
48441341f5
Merge pull request #18587 from Ultimaker/CURA-11521_long_line_sim
...
[CURA-11521] Fix last line when previewing active simulation.
2024-03-13 11:14:45 +01:00
Remco Burema
778bd11a71
Review comments to add a comment.
...
Done as part of CURA-11521
2024-03-13 11:13:03 +01:00
Remco Burema
5dcab95358
Code review: change name to 'vertex_distance_ratio'.
...
To be better in line with the other variables.
Done as part of CURA-11521
Co-authored-by: Saumya Jain <70144862+saumyaj3@users.noreply.github.com>
2024-03-13 11:10:04 +01:00
Saumya Jain
b5f5ced5d4
Merge branch '5.7' into CURA-11521_long_line_sim
2024-03-13 10:21:49 +01:00
Saumya Jain
cf7f807b41
placing Setting loaded from ucp on top before Suggested Profile setting
...
CURA-11721
2024-03-13 09:52:50 +01:00
HellAholic
0ac0e1f371
Merge pull request #18580 from Ultimaker/PP-447-Remove-solid-intent-SR30
...
Remove solid intent mode for SR-30 (support material) for Method X & XL
2024-03-13 09:49:20 +01:00
Erwan MATHIEU
4e564c7eb5
Add gradual flow plugin translations
2024-03-13 09:25:32 +01:00
Paul Kuiper
a67a61298e
Apply suggestions from code review
...
Undo changes to conandata.yml
Co-authored-by: HellAholic <alireza.doustdar@gmail.com>
2024-03-13 09:22:49 +01:00
Erwan MATHIEU
406a238d96
Update translation files with UCP file type
2024-03-13 09:03:20 +01:00
Remco Burema
d6295171dd
Add the last line (when time-sim active) as a separate batch instead.
...
part of CURA-11521
2024-03-13 08:43:41 +01:00
Remco Burema
6e75eb34af
Make lines update in real-time in the simulation-view too.
...
This approach does suffer from returning to exactly the same point, which can mess up the view.
part of CURA-11521
2024-03-12 23:38:09 +01:00
Paul Kuiper
2048b04024
Remove solid intent mode for SR-30 (support material)
...
PP-447
2024-03-12 18:03:55 +01:00
Saumya Jain
6e9b82f900
Merge branch '5.7'
2024-03-12 16:59:08 +01:00
Erwan MATHIEU
e8e106b9e9
Merge pull request #18579 from Ultimaker/CURA-11715-reenter-mimetype-for-ucp
...
Mimetype introduction for ucp
2024-03-12 16:42:12 +01:00
Saumya Jain
b06805dd85
Mimetype introduction for ucp
...
CURA-11715
2024-03-12 16:30:19 +01:00
Saumya Jain
5824cf5414
Both Project and UCP has same text
...
CURA-11715
2024-03-12 16:02:20 +01:00
Erwan MATHIEU
77c1dca7ff
Merge remote-tracking branch 'origin/5.7' into 5.7
2024-03-12 15:11:36 +01:00
Erwan MATHIEU
e1bfb2a60d
Update translation files with the brim_inside_margin description
2024-03-12 15:11:23 +01:00
Erwan MATHIEU
52a303e977
Slightly reformulate brim_inside_margin description
2024-03-12 14:54:22 +01:00
Saumya Jain
20cc036b61
Save as UCP text corrected
...
CURA-11715
2024-03-12 14:32:48 +01:00
Paul Kuiper
41cc4b5392
Updated Method material package versions to 2.0.0
...
PP-446
2024-03-12 09:36:35 +01:00
Paul Kuiper
634828ad20
Link up display names Nylon12-CF
...
PP-446
2024-03-11 16:04:27 +01:00
Paul Kuiper
ef833897fc
Update bundled packages with method materials. Added PET-CF and updated URLS.
...
PP-446
2024-03-11 15:14:20 +01:00
Erwan MATHIEU
c22f6955b9
Merge remote-tracking branch 'origin/5.7' into CURA-11475_low_performance_multiple_nozzles
2024-03-11 15:09:04 +01:00
Erwan MATHIEU
7c00d2f0b3
Merge remote-tracking branch 'origin/5.7' into 5.7
2024-03-11 13:25:51 +01:00
Erwan MATHIEU
790cc2ad50
Update translation labels
2024-03-11 13:25:24 +01:00
Casper Lamboo
55c133eb5b
Merge pull request #18568 from Ultimaker/CURA-11710-names-in-method-materials
...
Changed names of materials as per materials list
2024-03-11 13:08:38 +01:00
c.lamboo
77e949830a
Add missing ABS-CF material to material map
...
CURA-11710
2024-03-11 13:04:26 +01:00
Erwan MATHIEU
ff4652e16a
Add comments not to translate "Universal Cura Project"
2024-03-11 12:49:11 +01:00
Erwan MATHIEU
9865bdac70
Don't translate Cura name
2024-03-11 11:55:18 +01:00
c.lamboo
b615177739
Merge branch '5.7'
...
# Conflicts:
# conandata.yml
2024-03-11 11:32:09 +01:00
Casper Lamboo
cba5b0dc48
Merge pull request #18549 from Ultimaker/CURA-11650-thumnails-missing
...
Cura 11650 thumnails missing
2024-03-11 11:29:58 +01:00
Saumya Jain
0da0c720dd
Changed names of materials as per materials list
...
Removed materials with GUID not found
CURA-11710
2024-03-11 11:04:51 +01:00
Jelle Spijker
ee23e2cf67
Add native CAD plugin to Enterprise edition
...
The native CAD plugin has been added to the requirements and reference copy operations in the Conan data file and Conan file script.
Now the native CAD plugin will only be included if the enterprise build flag is set. This ensures that unnecessary dependencies are not brought into non-enterprise builds.
2024-03-11 11:01:53 +01:00
