34357 Commits

Author SHA1 Message Date
Saumya Jain
aaf7f0dc70 check_missing_translations for windows
fixing the paths to be used correctly

CURA-11732
2024-03-21 09:57:24 +01:00
Erwan MATHIEU
8f210ab5aa Include suggestions for Italian provided by @GMagician 2024-03-21 09:29:31 +01:00
Erwan MATHIEU
7114187c72 Merge remote-tracking branch 'origin/5.7-translations' into 5.7-translations 2024-03-21 08:49:16 +01:00
Erwan MATHIEU
3f8dfa242f Use argparse to parse the script arguments 2024-03-21 08:48:15 +01:00
Erwan MATHIEU
42cee8a16d
Merge branch '5.7' into 5.7-translations 2024-03-20 14:07:12 +01:00
Erwan MATHIEU
5039caa0f3 Fix some Chinese translations
Manually cherry-picked from e839fc85989b8db510c3c6d9b0ab0486569ef147
2024-03-20 13:53:31 +01:00
Erwan MATHIEU
15d600e76c
Merge pull request #18567 from Ultimaker/add_cad_plugin
Add native CAD plugin to Enterprise edition
2024-03-20 11:18:51 +01:00
Erwan MATHIEU
b424b22114
Merge branch '5.7' into add_cad_plugin 2024-03-20 11:18:06 +01:00
Erwan MATHIEU
0de9884295
Tiny syntax fix 2024-03-20 11:17:47 +01:00
Erwan MATHIEU
39e2579153 Add script to check/fix missing translations 2024-03-20 09:59:48 +01:00
Erwan MATHIEU
5de2969abf Merge remote-tracking branch 'origin/5.7' into 5.7-translations 2024-03-20 09:24:10 +01:00
Erwan MATHIEU
47c906bb16 Restore missing translations due to collision 2024-03-20 09:10:55 +01:00
Erwan MATHIEU
5aa2d31adc Restore missing translation due to collision 2024-03-19 16:37:47 +01:00
Erwan MATHIEU
cb80940616 Restore missing label context 2024-03-19 16:28:51 +01:00
Remco Burema
d441130e3b Defensive programming: Fix current path can be None.
should fix CURA-11741 (sentry cura '708')
2024-03-19 10:43:11 +01:00
Casper Lamboo
22d860f4e2
Merge pull request #18653 from Ultimaker/CUR-11720-ucp-correct-ovverrides-ii
use notify to update `exportedSettingModel`
2024-03-18 17:05:30 +01:00
Saumya Jain
6a7fe9a423
Merge branch '5.7' into CUR-11720-ucp-correct-ovverrides-ii 2024-03-18 15:45:11 +01:00
Casper Lamboo
2ec8e22106
Merge pull request #18603 from Ultimaker/CURA-11700-trigger-area-for-selecting-machine
Added Cura.MachineSelector in place of combobox
2024-03-18 15:01:24 +01:00
Saumya Jain
eac2d3b173 removes the unnecessary 'z' attribute
CURA-11700
2024-03-18 14:51:55 +01:00
Saumya Jain
37dc9e5dcb Update UI layering and MachineSelector properties in 3MFReader
The z-index property of combobox and Loader elements in WorkspaceSection.qml was adjusted to ensure proper layering.

CURA-11700
2024-03-18 14:47:24 +01:00
Saumya Jain
4da17d643d Update model data handling in 3MFReader plugin
partially revert 4dd0113a784687c0fd0ed5397acb9a4bf01d428c
CURA-11720
2024-03-18 12:46:10 +01:00
Saumya Jain
5eeee37f0e Update visibility condition in WorkspaceDialog
CURA-11700
2024-03-18 12:32:34 +01:00
Saumya Jain
1ebab878fe
Merge branch '5.7' into CURA-11700-trigger-area-for-selecting-machine 2024-03-18 12:31:41 +01:00
Saumya Jain
522310b48a
Merge branch '5.7' into CUR-11720-ucp-correct-ovverrides-ii 2024-03-18 12:17:16 +01:00
c.lamboo
4dd0113a78 Add dedicate functions for exportedSettingModelItems and exportedSettingModelRowCount 2024-03-18 12:14:58 +01:00
c.lamboo
a58cd69b39 use notify to update exportedSettingModel 2024-03-18 11:55:50 +01:00
Erwan MATHIEU
c3a2a6f8d0 Merge remote-tracking branch 'origin/5.7' into 5.7-translations 2024-03-18 08:54:45 +01:00
Erwan MATHIEU
57d8a2691a Add missing gradual flow translations 2024-03-18 08:50:34 +01:00
Erwan MATHIEU
acea7bdeec Clear more untranslated labels 2024-03-15 17:33:13 +01:00
Erwan MATHIEU
836b54279d Cleared non-translated labels 2024-03-15 16:30:53 +01:00
Erwan MATHIEU
0fec7bd3c7
Properly pin dependancies 5.7.0-beta.1 2024-03-15 15:07:28 +01:00
Erwan MATHIEU
e27432990d
Prepare for 5.7.0-beta.1 release 2024-03-15 14:53:57 +01:00
Casper Lamboo
7de3f39483
Merge pull request #18620 from Ultimaker/CURA-11526-II
Cura 11526 ii
2024-03-15 14:50:36 +01:00
Erwan MATHIEU
9415c1015b
Merge pull request #18615 from Ultimaker/CURA-11738-update-changelog-for-beta
changelog for beta
2024-03-15 14:45:44 +01:00
Saumya Jain
409e855435
Merge branch '5.7' into 5.7-translations 2024-03-15 14:36:11 +01:00
c.lamboo
c4336e8e8b Merge remote-tracking branch 'origin/5.7' into 5.7 2024-03-15 14:35:00 +01:00
c.lamboo
8e0127471d Bumb setting version in fdmextruder and fdmprinter
CURA-11526
2024-03-15 14:34:51 +01:00
Saumya Jain
b8e4251e6a Removed repeated line
CURA-11738
2024-03-15 14:27:26 +01:00
Saumya Jain
826b2e42b2 removed bug for signed out
CURA-11738
2024-03-15 14:00:40 +01:00
Saumya Jain
d42f894965 fixed blank lines for consistency
CURA-11738
2024-03-15 13:58:39 +01:00
Erwan MATHIEU
804e28a5c7
Merge branch '5.7' into CURA-11738-update-changelog-for-beta 2024-03-15 13:27:35 +01:00
Erwan MATHIEU
0870bbd5aa
Merge pull request #18618 from Ultimaker/CURA-11734-add-a-learn-more-buttn-for-ucp
Added learn more button while saving and opening UCP
2024-03-15 13:12:10 +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
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 3aa32298dc54f734d4ddd4fc506fb94ea86e63a2.
2024-03-15 11:44:37 +01:00
c.lamboo
bb3c4b455c Bumb sdk version
CURA-11526
2024-03-15 10:28:45 +01:00