~ultimaker/uranium/+git/Uranium:SettingFunction_cleanup_imports

Last commit made on 2023-07-07
Get this branch:
git clone -b SettingFunction_cleanup_imports https://git.launchpad.net/~ultimaker/uranium/+git/Uranium

Branch merges

Branch information

Name:
SettingFunction_cleanup_imports
Repository:
lp:~ultimaker/uranium/+git/Uranium

Recent commits

a62153f... by Frederic98 <email address hidden>

update translations

ee747ce... by Frederic Meeuwissen <email address hidden>

Clean up imports

f4f5032... by Frederic Meeuwissen <email address hidden>

Only import type hints when type checking

49ba701... by Jelle Spijker <email address hidden>

Merge remote-tracking branch 'origin/5.4'

# Conflicts:
# resources/i18n/cs_CZ/uranium.po
# resources/i18n/de_DE/uranium.po
# resources/i18n/es_ES/uranium.po
# resources/i18n/fi_FI/uranium.po
# resources/i18n/fr_FR/uranium.po
# resources/i18n/hu_HU/uranium.po
# resources/i18n/it_IT/uranium.po
# resources/i18n/ja_JP/uranium.po
# resources/i18n/ko_KR/uranium.po
# resources/i18n/nl_NL/uranium.po
# resources/i18n/pl_PL/uranium.po
# resources/i18n/pt_BR/uranium.po
# resources/i18n/pt_PT/uranium.po
# resources/i18n/ru_RU/uranium.po
# resources/i18n/tr_TR/uranium.po
# resources/i18n/uranium.pot
# resources/i18n/zh_CN/uranium.po
# resources/i18n/zh_TW/uranium.po

8de64bf... by casperlamboo <email address hidden>

update translations

e3b3a5a... by HellAholic <email address hidden>

Fix recreate db on windows

CURA-10743

Co-authored-by: Casper Lamboo <email address hidden>

52f7670... by Casper Lamboo <email address hidden>

Merge pull request #882 from Ultimaker/CURA-10713_bumpup_various_security_deps

Bump up version of cryptography

2b14c80... by Jelle Spijker <email address hidden>

Bump up version of cryptography

We were using a version of 3 years ago

4d823f4... by rburema <email address hidden>

update translations

245a534... by Remco Burema <email address hidden>

Merge branch '5.4'