Commit graph

32165 commits

Author SHA1 Message Date
Bryan Foley
bed7f22a1b SEM-166 UMs7 firmware location updated
With this commit we use the dedicated update url for the UMs7 firmware
location instead of the UMs5 location
2023-04-14 13:32:10 +02:00
c.lamboo
f337788ba2 Update translations
CURA-10371
2023-04-14 13:09:43 +02:00
bryanfoley
e606dae5c5 Applied printer-linter format 2023-04-14 09:33:54 +00:00
Bryan Foley
807f407d9f SEM-166 Add extra BOM numbers to UMs3, UMs5 and UMs7 2023-04-14 11:31:57 +02:00
Joey de l'Arago
12c53ce4e4 Use resolveOrValue 2023-04-12 16:26:46 +02:00
Joey de l'Arago
83117e5985 bump versions 2023-04-12 16:00:24 +02:00
Joey de l'Arago
ed1b844b41 Remove random string and format 2023-04-12 15:43:03 +02:00
Joey de l'Arago
ee0b14fcac Update update script. Deleted qualities will now be replaced with new ones. 2023-04-12 15:40:13 +02:00
Joey de l'Arago
04adf487f3 Merge remote-tracking branch 'origin/updated_elegoo_definitions' into updated_elegoo_definitions 2023-04-12 10:19:03 +02:00
Joey de l'Arago
a70e212124 Merge branch 'main' into updated_elegoo_definitions
# Conflicts:
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/abs040/abs_040024.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/asa040/asa_040024.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/petg040/petg_040028.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040012.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040016.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040020.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040024.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040028.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg
2023-04-11 19:07:27 +02:00
Ashok Varma
0217a8642d
Lint Fix : removed redundant override
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-09 12:40:13 -07:00
Ashok-Varma
044651f856 Add SV06 Plus profile based on Sovol profile, Update SV06 profile with updates 2023-04-09 09:44:53 -07:00
William Faircloth
5f5253ea59
feat: use correct name 2023-04-08 15:18:48 -04:00
William Faircloth
2f0ac6b998
feat: add kp3s pro 2023-04-08 15:10:14 -04:00
Jelle Spijker
38cf3131ee
Merge branch 'main' into CURA-10415_main_based_update_tree 2023-04-08 10:44:20 +02:00
Jelle Spijker
47a248e825
Bump-up settings version to 22
for Creality ender 3 S1 pro
2023-04-08 10:42:48 +02:00
jellespijker
30e03a781f update translations 2023-04-08 08:32:17 +00:00
Jelle Spijker
0ad2687bdb
Run conan profile detection after switching compiler
Should fix failing UT
2023-04-08 10:25:51 +02:00
Jelle Spijker
30d812d138
Run conan profile detection after switching compiler
Should fix failing UT
2023-04-08 10:25:17 +02:00
Jelle Spijker
bba02e5e16
Merge remote-tracking branch 'origin/main' into CURA-10415_main_based_update_tree 2023-04-08 10:23:17 +02:00
Jelle Spijker
59d0fb68ea
Merge remote-tracking branch 'origin/main' into CURA-10415_main_based_update_tree
# Conflicts:
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
2023-04-08 10:20:12 +02:00
Jelle Spijker
82ad1cbff3
Update unit-test.yml 2023-04-08 09:39:20 +02:00
Casper Lamboo
2e4d580277
Merge pull request #14272 from sparkym3/Make_Creality_Ender_3_S1_consistent
Make Creality Ender 3 S1 consistent
2023-04-07 16:11:49 +02:00
c.lamboo
cf7bc063f1 Fix: Make "add printer" sections individually collapsable
One variable was incorrectly named

CURA-10484
2023-04-06 21:52:50 +02:00
c.lamboo
20b171dbeb Make "add printer" sections individually collapsable
CURA-10484
2023-04-06 21:46:51 +02:00
jellespijker
66d43d52aa update translations 2023-04-06 15:56:17 +00:00
Jelle Spijker
06e140a0fa
Merge branch '5.3'
# Conflicts:
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
2023-04-06 17:52:54 +02:00
Jelle Spijker
061a09f8b8
Merge branch 'CURA-10376_fix_TM' into 5.3 2023-04-06 14:35:57 +02:00
Jelle Spijker
43f6d89c1c
Merge Smartling translations
Contribute to CURA-10376
2023-04-06 14:24:34 +02:00
Jelle Spijker
01d22d1ad4
Also check on Uranium.pot
Contribute to CURA-10376
2023-04-05 12:35:23 +02:00
Jelle Spijker
1763b9bf9d
filter on relevant cura files
Contribute to CURA-10376
2023-04-04 15:47:56 +02:00
c.lamboo
af4efad1cf Don't capitalize "UltiMaker" for brand names
CURA-10376
2023-04-03 21:46:51 +02:00
c.lamboo
ef09fe640b Fix removing tu elements
CURA-10376
2023-04-03 21:46:24 +02:00
Jelle Spijker
19b3c93a0c
Hand-over
Contribute to CURA-10376
2023-04-03 13:51:03 +02:00
Jelle Spijker
0feda7fe08
Sanitize the fuzzy key string before match
Contribute to CURA-10376
2023-04-03 13:29:05 +02:00
Jelle Spijker
1792f80ac8
Sanitize the string before write
Contribute to CURA-10376
2023-04-03 13:12:23 +02:00
Jelle Spijker
95962b2914
Set fuzz_match_key
Contribute to CURA-10376
2023-04-03 12:42:04 +02:00
Jelle Spijker
f190b0395d
Added script to fix a tmx file with existing po files
Contribute to CURA-10376
2023-04-03 10:54:45 +02:00
Jelle Spijker
37a446a4ff
Update conan-recipe-version.yml 2023-03-31 08:17:49 +02:00
Jelle Spijker
28d6e993df
Bump up setting version to 22 2023-03-31 07:24:43 +02:00
Jelle Spijker
5680ea8ee8
Merge pull request #15092 from Ultimaker/5.3
5.3
2023-03-30 15:07:45 +00:00
Jelle Spijker
980de97162 Set FileMode ExistingFile in the open file dialog 2023-03-30 15:05:25 +02:00
Remco Burema
c3ca642a78
Merge pull request #15057 from Ultimaker/CURA-10317_other_inconsitent_material_profiles_in_internal_builds
Cura 10317 other inconsistent material profiles in internal builds
2023-03-29 20:54:21 +02:00
Jelle Spijker
b7498e81a9
set version to 5.4.0-alpha when None 2023-03-29 08:00:50 +02:00
Thomas Rahm
52173cd732 Fixed Typo 2023-03-29 07:14:26 +02:00
Thomas Rahm
536c95555e Suggested profile changes: Ensure minimum support area is 0 for tree support to avoid 'No trees generated' bug report. Removed extra z heightfor Tree support as this should no longer be required with the new implementation 2023-03-29 06:50:30 +02:00
Thomas Rahm
2e2f6f82ea More Tree Support realated changes to fdmprinter.def.json 2023-03-29 06:39:57 +02:00
Remco Burema
066b07160c Defensive programming for unit-test result publising.
Make it slightly more robust, since there have been problems with this in the past aparently (see github.com/ations/runner/1722). Manual rewrite of earlier pull-request Cura/pull/13497

Co-authored-by: 0r31 <orel@dagoma.fr>
2023-03-28 16:31:00 +02:00
Jelle Spijker
87fb723fdd
Merge pull request #15067 from Ultimaker/CURA-10394_remove_wireprinting
[CURA-10394] Remove wire-printing options
2023-03-28 13:49:37 +00:00
rburema
4091800340 update translations 2023-03-28 11:58:00 +00:00