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
Jelle Spijker
974ea889ca
Update version for main
2023-06-06 15:41:56 +02:00
Jelle Spijker
1fcf6e4894
Update deps for 5.4 branch
2023-06-06 15:40:54 +02:00
jellespijker
4d5002b038
Applied printer-linter format
2023-06-06 13:15:29 +00:00
Jelle Spijker
4a3c3155cf
Update rest preference label
...
Rest Preference
"Force Only Buildplate" can be "On Buildplate when possible",
Because Support can be created everywhere but as much as possible starting from the buildplate and in some case we can have some support starting from the model..
"On Model If Necessary" can be "On Model If required",
Because support can be created everywhere and if required you can have support starting on the model. And Sometimes Required means they start on the model because you have more direct or simple support if you start on the model.
As suggested by @5axes
2023-06-06 15:14:14 +02:00
nallath
8b5192c047
update translations
2023-06-06 10:46:57 +00:00
Jaime van Kessel
ea10a5acf2
Merge branch 'main' of github.com:Ultimaker/Cura
2023-06-06 12:42:32 +02:00
Jaime van Kessel
e2ac1ef810
Add anealing description and icon
...
CURA-10633
2023-06-06 12:42:09 +02:00
nallath
4e7a41b469
Applied printer-linter format
2023-06-06 09:36:32 +00:00
Jaime van Kessel
bb991e1e2c
Fix the formula for support_enable and support_extruder_nr
...
The formulas got mixed up somehow. Shows that devs shouldn't commit before
their morning coffee ;)
CURA-10633
2023-06-06 11:34:28 +02:00
Jelle Spijker
18653d9ef4
Use SHA of the commit instead of no_commits since last tag
...
We determine the version of a conan package based on a Git tag and then count the number of commits between the last tag
and the current tag to get the +testing_6 or +testing_13 after the alpha/beta designation etc.
This will give us logical sequential numbers with which we can determine which version was later.
But the method can't take into account tags created on release branches, a branch parallel to the main branch, once
these are merged, after a tag then suddenly the first tag it encounters is closer then it was before, this means that we
then accidentally create a second package with the same version and this starts tripping things up.
Now these logical statements aren't necessary to determine the latest version, according to semver everything after the
+ is ignored and both versions should be compatible.
An easy fix is to replace the testing_<no_of_commits_since_last_tag> with testing_<commit_hash> that way we don't have
two conan packages created from different commits anymore, which is the most common root cause of our problems in this
flow.
2023-06-06 08:33:03 +02:00
Jelle Spijker
ee0e55cf97
Bump up fdmprinter and fdmextruder
2023-06-05 11:51:25 +02:00
Jelle Spijker
775266812b
Merge pull request #15661 from Ultimaker/CURA-10617_new_logo
...
Update the logo
2023-06-05 11:26:10 +02:00
Jelle Spijker
e3a4c84463
Merge remote-tracking branch 'origin/PP-336_Cleanup_infill_overlap_settings'
...
# 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-05 11:09:16 +02:00
Jelle Spijker
ba5cd429c0
Merge pull request #15632 from Ultimaker/PP-81_Easy_to_tear_of_brim
...
PP-81 easy to tear of brim
2023-06-05 10:56:39 +02:00
Jelle Spijker
e75d7f07f7
Merge pull request #15525 from Ultimaker/PP-321_Cleanup_skin_overlap_settings
...
Cleanup skin overlap settings
2023-06-05 10:18:37 +02:00
