Commit graph

34789 commits

Author SHA1 Message Date
Casper Lamboo
3715f26530
Merge pull request #18616 from Ultimaker/CURA-11526-upgrade-script
Cura 11526 upgrade script
2024-03-15 12:51:22 +01:00
Saumya Jain
59d395a121 Added learn more button while saving and opening UCP
CURA-11734
2024-03-15 12:20:56 +01:00
c.lamboo
74678bf6fb Bumb version for profiles
CURA-11526
2024-03-15 11:59:09 +01:00
Casper Lamboo
1c6a018c8b
Merge branch '5.7' into CURA-11526-upgrade-script 2024-03-15 11:44:57 +01:00
c.lamboo
597fbb06a0 Revert "Bumb version in profiles"
This reverts commit 3aa32298dc.
2024-03-15 11:44:37 +01:00
c.lamboo
bb3c4b455c Bumb sdk version
CURA-11526
2024-03-15 10:28:45 +01:00
Saumya Jain
9f5a952d11 changelog for beta
CURA-11738
2024-03-15 10:28:29 +01:00
c.lamboo
3aa32298dc Bumb version in profiles
CURA-11526
2024-03-15 10:28:16 +01:00
c.lamboo
c821fd6b39 Fix parser value parsing
CURA-11526
2024-03-15 10:19:44 +01:00
c.lamboo
32cf64f90c Upgrade SettingVersion
CURA-11526
2024-03-15 10:19:31 +01:00
Erwan MATHIEU
b3317fdfc4 Updated translations 2024-03-15 09:56:36 +01:00
Saumya Jain
b920c7934b
Merge branch '5.7' into add_cad_plugin 2024-03-15 09:24:32 +01:00
Saumya Jain
85866af3d6
Merge branch 'main' into Cura_ankermake_august 2024-03-15 09:21:04 +01:00
c.lamboo
2948af3f96 Add upgrade script for changed brim_location setting
CURA-11526
2024-03-14 22:29:28 +01:00
Remco Burema
1eb69535bc
Merge pull request #18605 from Ultimaker/CURA-11715-save_as_type-for-3mf
Cura 11715 save as type for 3mf
2024-03-14 19:02:12 +01:00
Remco Burema
e0f5d2595c Only save project as project (not ucp).
If we don't limit this, the user would also have the basically fake option to save as UCP ... which would still save as a workspace/project instead, leading to much confusion. (This is the 2nd instance of where this needs to go actually...)

part of CURA-11715
2024-03-14 18:45:40 +01:00
Saumya Jain
a80ee3fb42
Merge pull request #18589 from Ultimaker/CURA-11697
Fix post processing plugin button alignment
2024-03-14 17:19:20 +01:00
Saumya Jain
0698455394
Merge branch '5.7' into CURA-11697 2024-03-14 17:18:43 +01:00
Saumya Jain
40bc08f482 Apparantly the first time override is written it is not overriden by next upload.
Now, it does

CURA-11720
2024-03-14 17:09:11 +01:00
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 42b72f81bb.
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