32404 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Casper Lamboo	7f62744e21	Merge pull request #15803 from Ultimaker/CURA-10713_bumpup_various_security_deps ... Cura 10713 bumpup various security deps	2023-06-21 16:45:14 +02:00
casperlamboo	38a684fe05	Applied printer-linter format	2023-06-21 09:38:32 +00:00
c.lamboo	cd58703dca	Remove exclude materials from 3rd party printers ... With the changes from https://github.com/Ultimaker/Cura/pull/15692 logic regarding the exclude materials printer setting changed. It has never worked properly before. Now that it works properly again a ton of materials were excluded that were never intended to be excluded. As we can never be sure if an exclude material was intended or not we decided to be pretty agressive in removing exclude materials. This way the behavior is closed to the behavior prior to the exclude material fix. There was one case were we decide to leave an exclude material in. If a printer has a material diameter of `175` *and* the material would specifically specify the `175` substring (e.g. `dsm_arnitel2045_175`). When this is the case we were pretty certain it was intended to exclude this material. CURA-10599	2023-06-21 11:37:08 +02:00
Casper Lamboo	84b914a811	Merge pull request #15793 from Ultimaker/CURA-10701_bumpup_shapely ... Bump up version of Shapely	2023-06-20 12:06:28 +02:00
Jelle Spijker	c49a215372	Bump down version of keyring ... SecretStorage 3.3.3 requires 23.0.1 Fixes CURA-10713	2023-06-19 11:02:18 +02:00
Jelle Spijker	14aaf10aa7	Merge branch 'bumpcryptography' into CURA-10713_bumpup_various_security_deps	2023-06-19 10:41:57 +02:00
Jelle Spijker	eb75207577	Merge branch 'CURA-10700_bumpup_secretstorage' into CURA-10702_bumpup_keyring ... # Conflicts: # requirements.txt	2023-06-18 14:16:59 +02:00
Jelle Spijker	eb07777f83	Bump up version of keyring ... Fixes CURA-10702	2023-06-18 14:08:14 +02:00
Jelle Spijker	4d88265ebd	Bump up version of Shapely ... Fixes CURA-10701	2023-06-18 13:59:29 +02:00
Jelle Spijker	f73cbb84de	Bump up version of SecretStorage ... Fixes CURA-10700	2023-06-18 13:54:15 +02:00
Jelle Spijker	dc26217992	Bump up version of cryptography ... We were using a version of 3 years ago	2023-06-18 13:42:30 +02:00
Jelle Spijker	831bda4139	One namechange a year is enough	2023-06-18 13:30:11 +02:00
Jelle Spijker	91410f51fe	Merge pull request #15745 from Ultimaker/CURA-8513 ... Update certifi requirement	2023-06-18 13:27:50 +02:00
Jelle Spijker	5b8e9af49a	Merge branch 'main' into CURA-8513 ... # Conflicts: # resources/i18n/cs_CZ/cura.po # resources/i18n/cura.pot # resources/i18n/de_DE/cura.po # resources/i18n/es_ES/cura.po # resources/i18n/fi_FI/cura.po # resources/i18n/fr_FR/cura.po # resources/i18n/hu_HU/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/pl_PL/cura.po # resources/i18n/pt_BR/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 # resources/i18n/zh_TW/cura.po	2023-06-18 13:19:36 +02:00
Jelle Spijker	b5e2018092	Use latest/stable for future developement of 5.4	2023-06-18 13:18:54 +02:00
Jelle Spijker	2a8c2768d8	Merge remote-tracking branch 'origin/5.4' ... # Conflicts: # conanfile.py	2023-06-18 13:16:47 +02:00
Jelle Spijker	e61f2f3d75	Update to latest certifi package ... The ticket mentioned that the current version is 2021.5.30 but the ticket was created in 2021; Updating to the latest version is the proper way Contributes to CURA-8513	2023-06-18 13:14:43 +02:00
Remco Burema	fa8e48152e	Pause-at-height: Under rare circumstances T might not be an extruder switch. ... Some printers accept commands like TIMELAPSE_TAKE_FRAME or whatever, after all. Make it explciti that a line should start with T<number> in order to qualify. Should fix #15729	2023-06-16 09:09:01 +02:00
c.lamboo	791f70dfe7	Pin dependencies	2023-06-15 23:32:17 +02:00
Remco Burema	2670a22c0f	Merge branch '5.4'	2023-06-15 22:44:03 +02:00
Remco Burema	99e1fcd4f8	Pause-at-height: Under rare circumstances, T might not be temperature. ... Some printers accept commands like TIMELAPSE_TAKE_FRAME or whatever. Should fix #15729	2023-06-15 22:34:39 +02:00
Remco Burema	bbcc626537	Bump SDK version to 8.4.0	2023-06-15 22:28:31 +02:00
Casper Lamboo	4fa9460007	Merge pull request #15705 from Ultimaker/CURA-10677_Releasenotes54 ... Updated Changelog for Cura 5.4	2023-06-15 17:15:11 +02:00
c.lamboo	c18061911b	Add pyqt upgrade to changelog ... CURA-10677	2023-06-15 17:14:25 +02:00
rburema	502a17b62c	update translations	2023-06-15 13:37:58 +00:00
Remco Burema	d7b76e991e	Merge pull request #15739 from Ultimaker/CURA-10643_filter_extruder_by_material_prop ... [CURA-10643] filter extruder by material prop	2023-06-15 15:30:15 +02:00
casperlamboo	33e35c17c3	update translations	2023-06-14 12:43:58 +00:00
c.lamboo	3b81c0487e	Update certifi requirement ... CURA-8513	2023-06-14 14:39:56 +02:00
casperlamboo	fce6a66754	update translations	2023-06-14 11:57:47 +00:00
c.lamboo	fec5ebb709	Don't crash on NotADirectoryError or PermissionError when trying to load custom intent icons ... CURA-9709	2023-06-14 13:52:47 +02:00
nallath	94686d64a6	update translations	2023-06-14 09:24:00 +00:00
nallath	4a38439886	update translations	2023-06-14 09:21:14 +00:00
Jaime van Kessel	076c3ee84e	Merge branch '5.4' of github.com:Ultimaker/Cura	2023-06-14 11:18:06 +02:00
Jaime van Kessel	e92db87e47	Add missing excludes for TPLA for UM2+C ... Discussed this with PP&M, these materials should have been excluded but were overlooked. CURA-10599	2023-06-14 11:15:58 +02:00
Jaime van Kessel	5d0d1d485b	Merge branch 'CURA-10599_fix_exclude_materials' of github.com:Ultimaker/Cura into 5.4	2023-06-14 11:14:34 +02:00
casperlamboo	e9eec4e066	Applied printer-linter format	2023-06-14 08:41:48 +00:00
c.lamboo	6a9a03f698	Revert to previous setting value for support_extruder_nr ... CURA-10643	2023-06-14 10:40:26 +02:00
Jelle Spijker	9aa098fc90	Merge branch 'main' into CURA-10475_engineplugin ... # Conflicts: # conanfile.py # resources/i18n/cs_CZ/cura.po # resources/i18n/cura.pot # resources/i18n/de_DE/cura.po # resources/i18n/es_ES/cura.po # resources/i18n/fi_FI/cura.po # resources/i18n/fr_FR/cura.po # resources/i18n/hu_HU/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/pl_PL/cura.po # resources/i18n/pt_BR/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 # resources/i18n/zh_TW/cura.po	2023-06-13 17:46:27 +02:00
Jaime van Kessel	62ebcbc8d5	Fix repeated line in changelog ... Thanks to qwerty8224 for spotting it! CURA-10677	2023-06-13 16:31:49 +02:00
c.lamboo	559772e178	Merge branch '5.4' into CURA-10643_filter_extruder_by_material_prop	2023-06-13 16:25:57 +02:00
nallath	43292e513f	update translations	2023-06-13 14:19:00 +00:00
Jaime van Kessel	151ab6bf44	Merge branch '5.4' of github.com:Ultimaker/Cura	2023-06-13 16:13:56 +02:00
Paul Kuiper	f4abdaece7	Removed raft airgap value change from this PR. Will be in a different PR. ... PP-351	2023-06-13 16:13:43 +02:00
Paul Kuiper	963a3eb532	Lower the maximum fan speed to improve the strength of small parts of a print. ... PP-351	2023-06-13 16:13:36 +02:00
Remco Burema	24ef3badbc	Update documentation: Added anyExtruderNrWithOrDefault function. ... done as part of CURA-10643	2023-06-13 16:04:56 +02:00
Remco Burema	68231c957d	Add settings-function to get an extruder based on a property. ... We wanted to select an extruder based on wether or not it has support-material, so that the user doesn't have to think about selecting a support extruder any more and in most cases, can't forget anymore either. The formula present in fdmprinter to do that was not only an unreadable nightmare, but also very slow. We decided to pull most of that functionality into the settings-function machinery instead (but just a bit more generic so other properties can be selected, not just 'material_is_support_material'). done as part of finishing off CURA-10643	2023-06-13 15:59:24 +02:00
c.lamboo	eca903430e	Fix setting text fields overlapping in per-object-settings ... CURA-10669	2023-06-13 15:24:59 +02:00
Jaime van Kessel	cd3e45c7c4	Merge branch '5.4' of github.com:Ultimaker/Cura	2023-06-12 15:34:54 +02:00
Jaime van Kessel	1c0be9c5ed	Also prevent warning spam if icon isn't set	2023-06-12 15:33:08 +02:00
Jaime van Kessel	7103b9b333	Prevent qml warning spam if custom_icon isn't set	2023-06-12 14:48:31 +02:00