Casper Lamboo
|
b6c35e7b19
|
Use proper setting variable name
CURA-10472
|
2023-04-18 14:41:43 +02:00 |
|
jellespijker
|
f0d6354444
|
update translations
|
2023-04-18 08:41:24 +00:00 |
|
Jelle Spijker
|
5002d3695c
|
Merge branch 'main' into CURA-10415_main_based_update_tree
|
2023-04-18 10:36:56 +02:00 |
|
Remco Burema
|
cf6cbafb25
|
Fit 'Tree Support Rest Preference' description to behaviour.
CURA-10463
|
2023-04-18 10:36:12 +02:00 |
|
Jelle Spijker
|
6a040819c9
|
Merge pull request #15237 from Ultimaker/SEM-166_add_new_s_line_bom_numbers
SEM-166 Add extra BOM numbers to UMs3, UMs5 and UMs7
|
2023-04-18 10:32:22 +02:00 |
|
Bryan Foley
|
3b538d975c
|
Revert "SEM-166 Apply suggestions from code review"
This reverts commit 21de7a366735a282fb459dfff4b517a0a6df84e7.
|
2023-04-18 10:12:23 +02:00 |
|
Bryan Foley
|
21de7a3667
|
SEM-166 Apply suggestions from code review
Co-authored-by: Jelle Spijker <jelle.spijker@ultimaker.com>
|
2023-04-18 10:06:46 +02:00 |
|
Casper Lamboo
|
07fc38448b
|
Merge pull request #15022 from fieldOfView/fix_postprocessing_script_folders
Stop postprocessing plugin creating unnecessary script folders
|
2023-04-17 18:02:09 +02:00 |
|
Aldo Hoeben
|
7ddd1037a6
|
Merge branch 'main' into fix_postprocessing_script_folders
|
2023-04-17 16:39:30 +02:00 |
|
Jelle Spijker
|
a07b0bc183
|
Merge branch 'main' into CURA-10415_main_based_update_tree
|
2023-04-17 14:08:43 +02:00 |
|
Jelle Spijker
|
d7d32b07ae
|
Bump-up settings version to 22
for longer cube 2
|
2023-04-17 14:06:52 +02:00 |
|
Jelle Spijker
|
49da87b97d
|
Merge branch 'main' into CURA-10415_main_based_update_tree
|
2023-04-17 13:51:29 +02:00 |
|
Jaime van Kessel
|
55f88547d7
|
Merge branch '5.3' of github.com:Ultimaker/Cura
|
2023-04-17 12:49:09 +02:00 |
|
Jaime van Kessel
|
b5b6f8197b
|
Fix the writeStarted emit
When printing via abstract printer, this signal was not correctly emitted
causing the postprocessing script to fail
CURA-10524
|
2023-04-17 12:47:54 +02:00 |
|
fieldOfView
|
378e5fedea
|
Merge branch 'main' into fix_postprocessing_script_folders
|
2023-04-15 17:47:36 +02:00 |
|
Aldo Hoeben
|
1924d8c1b0
|
Continue if there is no scripts folder inside a resource folder
Co-authored-by: Casper Lamboo <casperlamboo@gmail.com>
|
2023-04-15 17:44:09 +02:00 |
|
casperlamboo
|
024876b314
|
Applied printer-linter format
|
2023-04-14 15:23:38 +00:00 |
|
Casper Lamboo
|
1a45962b04
|
Merge pull request #14479 from BradleyFord/main
Addition of Longer3D LK4 X
|
2023-04-14 17:22:29 +02:00 |
|
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 |
|
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 |
|
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 |
|