c.lamboo 61aff1756e Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter ... # 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-03-15 12:50:29 +01:00
..
bundled_packages	Add metadata for version upgrader 5.2 -> 5.3	2023-01-27 16:03:17 +01:00
definitions	Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter	2023-03-15 12:50:29 +01:00
extruders	Merge branch '5.3'	2023-03-07 13:48:39 +01:00
i18n	Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter	2023-03-15 12:50:29 +01:00
images	make S7 public	2023-01-26 19:11:16 +01:00
intent	Bump up the settings version to 21 in profiles/definitions	2023-01-30 11:40:04 +01:00
meshes	make S7 public	2023-01-26 19:11:16 +01:00
qml	Merge branch '5.3'	2023-03-15 12:45:47 +01:00
quality	Merge branch '5.3'	2023-02-23 13:41:00 +01:00
setting_visibility	Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter	2023-03-15 12:50:29 +01:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Update Changelog from Beta period	2023-03-07 10:46:47 +01:00
themes	Fix extruder icon text scaling. I've added a new font size here since there is not any real way I can see to scale the font based on the component size. This is because we do some magic with the font numbers before passing them to the QML.	2022-12-06 12:08:00 +01:00
variants	cleanup initial print temperatures	2023-02-09 14:28:11 +01:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00
README_resources.txt	Fix various typos	2021-09-07 11:33:54 -04:00