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
..
bundled_packages	Add metadata for version upgrader 5.2 -> 5.3	2023-01-27 16:03:17 +01:00
definitions	Merge remote-tracking branch 'origin/main' into CURA-10415_main_based_update_tree	2023-04-08 10:20:12 +02:00
extruders	Applied printer-linter format	2023-03-27 08:58:42 +00:00
i18n	update translations	2023-04-06 15:56:17 +00:00
images	Add new Hellbot 3D printers (#14500)	2023-03-21 20:29:44 +01:00
intent	Bump up setting version to 22	2023-03-31 07:24:43 +02:00
meshes	simplyfied meshes for LNL3D D6	2023-03-22 11:44:34 +01:00
qml	Fix: Make "add printer" sections individually collapsable	2023-04-06 21:52:50 +02:00
quality	Bump up setting version to 22	2023-03-31 07:24:43 +02:00
setting_visibility	Copied relevant setting_visibilities from xmas branch	2023-03-23 11:59:42 +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	Bump up setting version to 22	2023-03-31 07:24:43 +02: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