Saumya Jain
409e855435
Merge branch '5.7' into 5.7-translations
2024-03-15 14:36:11 +01:00
Erwan MATHIEU
1344ee4bd4
Merge branch '5.7' into CURA-11734-add-a-learn-more-buttn-for-ucp
2024-03-15 13:10:16 +01:00
Erwan MATHIEU
80a28021e9
Add blank line to split elements visually
...
CURA-11734
2024-03-15 13:09:54 +01:00
Saumya Jain
59d395a121
Added learn more button while saving and opening UCP
...
CURA-11734
2024-03-15 12:20:56 +01:00
Casper Lamboo
1c6a018c8b
Merge branch '5.7' into CURA-11526-upgrade-script
2024-03-15 11:44:57 +01:00
c.lamboo
c821fd6b39
Fix parser value parsing
...
CURA-11526
2024-03-15 10:19:44 +01:00
Erwan MATHIEU
b3317fdfc4
Updated translations
2024-03-15 09:56:36 +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
Saumya Jain
0698455394
Merge branch '5.7' into CURA-11697
2024-03-14 17:18:43 +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
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
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
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
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
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
Saumya Jain
20cc036b61
Save as UCP text corrected
...
CURA-11715
2024-03-12 14:32:48 +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
ff4652e16a
Add comments not to translate "Universal Cura Project"
2024-03-11 12:49:11 +01:00
Saumya Jain
a4d18601c7
Merge branch '5.7' into CURA-11650-thumnails-missing
2024-03-08 16:47:19 +01:00
Saumya Jain
38685793ab
Merge branch 'main' into CURA-11705-updating-strings-in-CURA
2024-03-08 14:46:04 +01:00
Saumya Jain
02fd7546a1
Merge branch 'main' into CURA-11650-thumnails-missing
2024-03-08 13:59:40 +01:00
Casper Lamboo
690eb81940
Merge pull request #18539 from Ultimaker/CURA-11655_fix_method_materials_loading
...
CURA-11655 Fix Method X/XL material selection
2024-03-08 13:53:49 +01:00
Saumya Jain
fe8f209484
Merge branch 'main' into CURA-11650-thumnails-missing
2024-03-08 13:46:16 +01:00
HellAholic
0149be1228
Merge pull request #18466 from Ultimaker/CURA-9838_brim_location
...
Cura 9838 brim location
2024-03-08 13:32:41 +01:00
Saumya Jain
174368d1eb
description of UCP
...
CURA-11705
2024-03-08 12:08:32 +01:00
Erwan MATHIEU
fa2257aaa3
Add fallback for uuid retrieval from DF
...
CURA-11655
2024-03-07 16:48:47 +01:00
Saumya Jain
dc031c4674
spelling of acquire
...
CURA-11650
2024-03-07 16:35:19 +01:00
Saumya Jain
e905ac9d33
adding a lock for the create snapshot
...
CURA-11650
2024-03-07 16:13:19 +01:00
Saumya Jain
dbf722e034
added settings for modifier meshes and grouped meshed
...
CURA-11403
2024-03-06 13:38:33 +01:00
Saumya Jain
831a1d4876
Reset openAsUcp at the start of preread
...
CURA-11403
2024-03-06 12:32:05 +01:00
Saumya Jain
3aefe729ed
Merge branch 'main' into CURA-11403-pap-modification
2024-03-06 10:29:16 +01:00
Saumya Jain
a63cf954d4
modify-settings-for-overlap’, 'support-blocker' and 'support-mesh' saved as their respective types along with their settings
...
CURA-11403
2024-03-06 10:28:09 +01:00
Saumya Jain
177fbabff0
Merge branch 'main' into CURA-9838_brim_location
2024-03-05 17:18:18 +01:00
Saumya Jain
8ef7b65710
removing update existing/ create new in case of UCP
...
also, making sure post processing scripts are not loaded.
CURA-11403
2024-03-05 16:37:17 +01:00
Remco Burema
5f6a8b1388
Merge branch 'main' into LimitXYAccelJerk
2024-03-05 16:09:50 +01:00
Saumya Jain
0e70b80446
removal of preference to not open the save dialog for ucp again
...
CURA-11403
2024-03-05 14:56:09 +01:00
Saumya Jain
3e23ce1c37
code review fixed for PAP
...
CURA-11403
2024-03-05 14:08:39 +01:00
Saumya Jain
ef1dfb6002
Merge branch 'main' into CURA-9838_brim_location
2024-03-05 10:51:58 +01:00
Saumya Jain
68669794de
selected printer is active printer also in case it is a cloud printer
...
CURA-11403
2024-03-04 18:03:11 +01:00
Saumya Jain
c879809836
selected printer is active printer in UCP
...
CURA-11403
2024-03-04 16:47:09 +01:00
Saumya Jain
f19320cad8
update the setting table while loading ucp the seond time
...
CURA-11403
2024-03-04 11:58:21 +01:00
