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
..
bundled_packages	Add metadata for version upgrader 5.2 -> 5.3	2023-01-27 16:03:17 +01:00
definitions	Disable Small Skin Area feature for now :-/	2023-06-07 11:25:49 +02:00
extruders	Cura 10437 sovol sv04 (#15376)	2023-04-28 13:23:11 +02:00
i18n	update translations	2023-06-08 14:47:35 +00:00
images	Add new Hellbot 3D printers (#14500)	2023-03-21 20:29:44 +01:00
intent	Added PET-CF quality and intent profiles.	2023-06-01 17:53:51 +02:00
meshes	Merge pull request #14499 from Ultimaker/remove_ultibot_from_meshes	2023-05-01 13:14:48 +02:00
qml	Merge branch '5.4'	2023-06-08 12:36:46 +02:00
quality	Merge remote-tracking branch 'origin/PP-336_Cleanup_infill_overlap_settings'	2023-06-05 11:09:16 +02:00
setting_visibility	Fixed upgrade settings	2023-04-28 11:44:22 +02:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Add proper credentials in changelog	2023-04-20 12:32:32 +02:00
themes	Update Annealing svg	2023-06-07 19:01:09 +02:00
variants	Merge remote-tracking branch 'origin/PP-336_Cleanup_infill_overlap_settings'	2023-06-05 11:09:16 +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