jspijker 8a38eb79e2 Merge remote-tracking branch 'origin/CURA-10182_add_sign_in_wall_enterprise' into 5.3 ... # Conflicts: # resources/i18n/de_DE/cura.po # resources/i18n/es_ES/cura.po # resources/i18n/fr_FR/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/pt_PT/cura.po # resources/i18n/ru_RU/cura.po # resources/i18n/tr_TR/cura.po # resources/i18n/zh_CN/cura.po		2023-03-06 22:53:16 +01:00
..
bundled_packages	Add metadata for version upgrader 5.2 -> 5.3	2023-01-27 16:03:17 +01:00
definitions	Merge pull request #14436 from Ultimaker/CURA_update_translations_with_new_empty_strings	2023-02-23 14:23:38 +01:00
extruders	Applied printer-linter format	2023-01-26 18:12:32 +00:00
i18n	Merge remote-tracking branch 'origin/CURA-10182_add_sign_in_wall_enterprise' into 5.3	2023-03-06 22:53:16 +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	Removed translations from WelcomContent	2023-03-06 12:07:29 +01:00
quality	Applied printer-linter format	2023-02-09 14:29:26 +01:00
setting_visibility	Remove references to material_flow_dependant_temperature	2023-01-30 13:27:51 +01:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Include more Modix Printers	2023-02-27 16:06:18 +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