casperlamboo
e9eec4e066
Applied printer-linter format
2023-06-14 08:41:48 +00:00
c.lamboo
6a9a03f698
Revert to previous setting value for support_extruder_nr
...
CURA-10643
2023-06-14 10:40:26 +02:00
Jelle Spijker
9aa098fc90
Merge branch 'main' into CURA-10475_engineplugin
...
# Conflicts:
# conanfile.py
# resources/i18n/cs_CZ/cura.po
# resources/i18n/cura.pot
# resources/i18n/de_DE/cura.po
# resources/i18n/es_ES/cura.po
# resources/i18n/fi_FI/cura.po
# resources/i18n/fr_FR/cura.po
# resources/i18n/hu_HU/cura.po
# resources/i18n/it_IT/cura.po
# resources/i18n/ja_JP/cura.po
# resources/i18n/ko_KR/cura.po
# resources/i18n/nl_NL/cura.po
# resources/i18n/pl_PL/cura.po
# resources/i18n/pt_BR/cura.po
# resources/i18n/pt_PT/cura.po
# resources/i18n/ru_RU/cura.po
# resources/i18n/tr_TR/cura.po
# resources/i18n/zh_CN/cura.po
# resources/i18n/zh_TW/cura.po
2023-06-13 17:46:27 +02:00
Jaime van Kessel
62ebcbc8d5
Fix repeated line in changelog
...
Thanks to qwerty8224 for spotting it!
CURA-10677
2023-06-13 16:31:49 +02:00
c.lamboo
559772e178
Merge branch '5.4' into CURA-10643_filter_extruder_by_material_prop
2023-06-13 16:25:57 +02:00
nallath
43292e513f
update translations
2023-06-13 14:19:00 +00:00
Jaime van Kessel
151ab6bf44
Merge branch '5.4' of github.com:Ultimaker/Cura
2023-06-13 16:13:56 +02:00
Paul Kuiper
f4abdaece7
Removed raft airgap value change from this PR. Will be in a different PR.
...
PP-351
2023-06-13 16:13:43 +02:00
Paul Kuiper
963a3eb532
Lower the maximum fan speed to improve the strength of small parts of a print.
...
PP-351
2023-06-13 16:13:36 +02:00
Remco Burema
24ef3badbc
Update documentation: Added anyExtruderNrWithOrDefault function.
...
done as part of CURA-10643
2023-06-13 16:04:56 +02:00
Remco Burema
68231c957d
Add settings-function to get an extruder based on a property.
...
We wanted to select an extruder based on wether or not it has support-material, so that the user doesn't have to think about selecting a support extruder any more and in most cases, can't forget anymore either. The formula present in fdmprinter to do that was not only an unreadable nightmare, but also very slow. We decided to pull most of that functionality into the settings-function machinery instead (but just a bit more generic so other properties can be selected, not just 'material_is_support_material').
done as part of finishing off CURA-10643
2023-06-13 15:59:24 +02:00
c.lamboo
eca903430e
Fix setting text fields overlapping in per-object-settings
...
CURA-10669
2023-06-13 15:24:59 +02:00
Jaime van Kessel
cd3e45c7c4
Merge branch '5.4' of github.com:Ultimaker/Cura
2023-06-12 15:34:54 +02:00
Jaime van Kessel
1c0be9c5ed
Also prevent warning spam if icon isn't set
2023-06-12 15:33:08 +02:00
Jaime van Kessel
7103b9b333
Prevent qml warning spam if custom_icon isn't set
2023-06-12 14:48:31 +02:00
Jaime van Kessel
a2d9f53854
Merge branch '5.4' of github.com:Ultimaker/Cura
2023-06-12 14:45:23 +02:00
Casper Lamboo
f73154a2c5
Use camelCase for python function definition
...
CURA-10599
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2023-06-12 14:35:11 +02:00
c.lamboo
9c90bcc06e
Fix setting text fields overlapping in per-object-settings
...
CURA-10669
2023-06-12 14:29:30 +02:00
c.lamboo
731a2d10ed
Merge branch '5.4' into CURA-10599_fix_exclude_materials
...
# Conflicts:
# resources/i18n/cs_CZ/cura.po
# resources/i18n/cura.pot
# resources/i18n/de_DE/cura.po
# resources/i18n/es_ES/cura.po
# resources/i18n/fi_FI/cura.po
# resources/i18n/fr_FR/cura.po
# resources/i18n/hu_HU/cura.po
# resources/i18n/it_IT/cura.po
# resources/i18n/ja_JP/cura.po
# resources/i18n/ko_KR/cura.po
# resources/i18n/nl_NL/cura.po
# resources/i18n/pl_PL/cura.po
# resources/i18n/pt_BR/cura.po
# resources/i18n/pt_PT/cura.po
# resources/i18n/ru_RU/cura.po
# resources/i18n/tr_TR/cura.po
# resources/i18n/zh_CN/cura.po
# resources/i18n/zh_TW/cura.po
2023-06-12 13:37:34 +02:00
c.lamboo
da33a26dc4
Fix unit tests
...
CURA-10599
2023-06-12 13:33:59 +02:00
c.lamboo
c049595fe3
Don't crash when file is not found for intent profiles
...
CURA-9709
2023-06-12 11:51:07 +02:00
c.lamboo
f18e470260
Fix setting text fields overlapping in per-object-settings
...
CURA-10669
2023-06-12 11:15:45 +02:00
MariMakes
20e40bcd8e
Updated Changelog for Cura 5.4
...
Updated Changelog for Cura 5.4
2023-06-09 18:22:34 +02:00
Jelle Spijker
58b33ae5b1
Fixes acc enable for ankermake m5
...
Fixes CURA-10098
2023-06-09 11:07:48 +02:00
casperlamboo
f9460bbb12
update translations
2023-06-09 07:14:44 +00:00
MariMakes
6727bb797b
CURA-10674 Update Splash Screen
2023-06-09 09:09:26 +02:00
Jelle Spijker
1cf10f06f3
Merge branch '5.4'
...
# Conflicts:
# resources/i18n/cs_CZ/cura.po
# resources/i18n/cs_CZ/fdmextruder.def.json.po
# resources/i18n/cs_CZ/fdmprinter.def.json.po
# resources/i18n/cura.pot
# resources/i18n/de_DE/cura.po
# resources/i18n/de_DE/fdmextruder.def.json.po
# resources/i18n/de_DE/fdmprinter.def.json.po
# resources/i18n/es_ES/cura.po
# resources/i18n/es_ES/fdmextruder.def.json.po
# resources/i18n/es_ES/fdmprinter.def.json.po
# resources/i18n/fdmextruder.def.json.pot
# resources/i18n/fdmprinter.def.json.pot
# resources/i18n/fi_FI/cura.po
# resources/i18n/fi_FI/fdmextruder.def.json.po
# resources/i18n/fi_FI/fdmprinter.def.json.po
# resources/i18n/fr_FR/cura.po
# resources/i18n/fr_FR/fdmextruder.def.json.po
# resources/i18n/fr_FR/fdmprinter.def.json.po
# resources/i18n/hu_HU/cura.po
# resources/i18n/hu_HU/fdmextruder.def.json.po
# resources/i18n/hu_HU/fdmprinter.def.json.po
# resources/i18n/it_IT/cura.po
# resources/i18n/it_IT/fdmextruder.def.json.po
# resources/i18n/it_IT/fdmprinter.def.json.po
# resources/i18n/ja_JP/cura.po
# resources/i18n/ja_JP/fdmextruder.def.json.po
# resources/i18n/ja_JP/fdmprinter.def.json.po
# resources/i18n/ko_KR/cura.po
# resources/i18n/ko_KR/fdmextruder.def.json.po
# resources/i18n/ko_KR/fdmprinter.def.json.po
# resources/i18n/nl_NL/cura.po
# resources/i18n/nl_NL/fdmextruder.def.json.po
# resources/i18n/nl_NL/fdmprinter.def.json.po
# resources/i18n/pl_PL/cura.po
# resources/i18n/pl_PL/fdmextruder.def.json.po
# resources/i18n/pl_PL/fdmprinter.def.json.po
# resources/i18n/pt_BR/cura.po
# resources/i18n/pt_BR/fdmextruder.def.json.po
# resources/i18n/pt_BR/fdmprinter.def.json.po
# resources/i18n/pt_PT/cura.po
# resources/i18n/pt_PT/fdmextruder.def.json.po
# resources/i18n/pt_PT/fdmprinter.def.json.po
# resources/i18n/ru_RU/cura.po
# resources/i18n/ru_RU/fdmextruder.def.json.po
# resources/i18n/ru_RU/fdmprinter.def.json.po
# resources/i18n/tr_TR/cura.po
# resources/i18n/tr_TR/fdmextruder.def.json.po
# resources/i18n/tr_TR/fdmprinter.def.json.po
# resources/i18n/zh_CN/cura.po
# resources/i18n/zh_CN/fdmextruder.def.json.po
# resources/i18n/zh_CN/fdmprinter.def.json.po
# resources/i18n/zh_TW/cura.po
# resources/i18n/zh_TW/fdmextruder.def.json.po
# resources/i18n/zh_TW/fdmprinter.def.json.po
2023-06-08 16:52:20 +02:00
jellespijker
476ef287e8
update translations
2023-06-08 14:48:48 +00:00
jellespijker
105aaf877e
update translations
2023-06-08 14:47:35 +00:00
jellespijker
63f2695e6f
update translations
2023-06-08 14:43:38 +00:00
Jelle Spijker
593c6530ff
Merge branch '5.4' into CURA-10599_fix_exclude_materials
...
# Conflicts:
# resources/i18n/cs_CZ/cura.po
# resources/i18n/cura.pot
# resources/i18n/de_DE/cura.po
# resources/i18n/es_ES/cura.po
# resources/i18n/fi_FI/cura.po
# resources/i18n/fr_FR/cura.po
# resources/i18n/hu_HU/cura.po
# resources/i18n/it_IT/cura.po
# resources/i18n/ja_JP/cura.po
# resources/i18n/ko_KR/cura.po
# resources/i18n/nl_NL/cura.po
# resources/i18n/pl_PL/cura.po
# resources/i18n/pt_BR/cura.po
# resources/i18n/pt_PT/cura.po
# resources/i18n/ru_RU/cura.po
# resources/i18n/tr_TR/cura.po
# resources/i18n/zh_CN/cura.po
# resources/i18n/zh_TW/cura.po
2023-06-08 16:43:30 +02:00
Jelle Spijker
03753b5225
Update pot translations
2023-06-08 16:42:23 +02:00
Jelle Spijker
359fbddac4
Update pot translations
2023-06-08 16:36:19 +02:00
Jelle Spijker
c737be9867
fix versioning for 5.4
2023-06-08 15:11:36 +02:00
Jelle Spijker
f4079653be
Update update-translation.yml
...
Downgrade python to 3.10.x
Maybe this will fix the changed behaviour of POT files suddenly being marked as changed
2023-06-08 13:10:32 +02:00
jellespijker
36cfa8a2e0
update translations
2023-06-08 10:41:26 +00:00
jellespijker
2328e76e92
update translations
2023-06-08 10:39:23 +00:00
jellespijker
f6a6db2ac1
update translations
2023-06-08 10:38:12 +00:00
Jelle Spijker
0f0d729549
Merge branch '5.4'
...
# Conflicts:
# conanfile.py
# 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-06-08 12:36:46 +02:00
Jelle Spijker
c8c6b59a08
Merge branch '5.4' into CURA-10599_fix_exclude_materials
2023-06-08 12:35:02 +02:00
Jelle Spijker
51d67fb578
Merge pull request #15639 from Ultimaker/CURA-9709_custom_icons_with_profiles
...
Allow for custom descriptions/icons in packaged intents
2023-06-08 12:34:39 +02:00
Jelle Spijker
58a9179d29
Merge branch '5.4' into CURA-9709_custom_icons_with_profiles
2023-06-08 12:32:24 +02:00
c.lamboo
046403f676
Update Annealing svg
...
CURA-10633
2023-06-07 19:01:09 +02:00
Casper Lamboo
1dbf7a6fe8
Merge pull request #15690 from Ultimaker/CURA-10500_disable_small_skin_feat
...
[CURA-10500] Disable Small Skin Area feature for now :-/
2023-06-07 18:55:26 +02:00
Jelle Spijker
22134f2d3c
Merge branch '5.4' into CURA-9709_custom_icons_with_profiles
...
# Conflicts:
# cura/Machines/Models/IntentSelectionModel.py
2023-06-07 16:20:48 +02:00
c.lamboo
da589e2f00
Fix exclude materials
...
CURA-10599
2023-06-07 16:20:09 +02:00
Remco Burema
1f7c11667f
Disable Small Skin Area feature for now :-/
...
We're not sure why this introduces a boatload of small segments into the infill, and we're out of time to try and fix this before the beta. Re-introducing after the beta seems like a bad idea, so this'll have to wait until 5.5 unfortunately.
Done as part of fixing for CURA-10500, but for the original Small Skin Area feature, see CURA-10201. For the ticket to (fix? and) reintroduce the feature, see CURA-10670.
2023-06-07 11:25:49 +02:00
c.lamboo
57bece831f
Don't scroll beyond bounds in recommended menu
...
CURA-10650
2023-06-06 16:31:36 +02:00
jellespijker
2d7f968932
update translations
2023-06-06 13:48:34 +00:00
jellespijker
1bf5d740ef
update translations
2023-06-06 13:47:34 +00:00
