32221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jellespijker	2328e76e92	update translations	2023-06-08 10:39:23 +00:00
Jelle Spijker	51d67fb578	Merge pull request #15639 from Ultimaker/CURA-9709_custom_icons_with_profiles ... Allow for custom descriptions/icons in packaged intents	2023-06-08 12:34:39 +02:00
Jelle Spijker	58a9179d29	Merge branch '5.4' into CURA-9709_custom_icons_with_profiles	2023-06-08 12:32:24 +02:00
c.lamboo	046403f676	Update Annealing svg ... CURA-10633	2023-06-07 19:01:09 +02:00
Casper Lamboo	1dbf7a6fe8	Merge pull request #15690 from Ultimaker/CURA-10500_disable_small_skin_feat ... [CURA-10500] Disable Small Skin Area feature for now :-/	2023-06-07 18:55:26 +02:00
Jelle Spijker	22134f2d3c	Merge branch '5.4' into CURA-9709_custom_icons_with_profiles ... # Conflicts: # cura/Machines/Models/IntentSelectionModel.py	2023-06-07 16:20:48 +02:00
Remco Burema	1f7c11667f	Disable Small Skin Area feature for now :-/ ... We're not sure why this introduces a boatload of small segments into the infill, and we're out of time to try and fix this before the beta. Re-introducing after the beta seems like a bad idea, so this'll have to wait until 5.5 unfortunately. Done as part of fixing for CURA-10500, but for the original Small Skin Area feature, see CURA-10201. For the ticket to (fix? and) reintroduce the feature, see CURA-10670.	2023-06-07 11:25:49 +02:00
jellespijker	2d7f968932	update translations	2023-06-06 13:48:34 +00:00
Jelle Spijker	1fcf6e4894	Update deps for 5.4 branch	2023-06-06 15:40:54 +02:00
jellespijker	4d5002b038	Applied printer-linter format	2023-06-06 13:15:29 +00:00
Jelle Spijker	4a3c3155cf	Update rest preference label ... Rest Preference "Force Only Buildplate" can be "On Buildplate when possible", Because Support can be created everywhere but as much as possible starting from the buildplate and in some case we can have some support starting from the model.. "On Model If Necessary" can be "On Model If required", Because support can be created everywhere and if required you can have support starting on the model. And Sometimes Required means they start on the model because you have more direct or simple support if you start on the model. As suggested by @5axes	2023-06-06 15:14:14 +02:00
nallath	8b5192c047	update translations	2023-06-06 10:46:57 +00:00
Jaime van Kessel	ea10a5acf2	Merge branch 'main' of github.com:Ultimaker/Cura	2023-06-06 12:42:32 +02:00
Jaime van Kessel	e2ac1ef810	Add anealing description and icon ... CURA-10633	2023-06-06 12:42:09 +02:00
nallath	4e7a41b469	Applied printer-linter format	2023-06-06 09:36:32 +00:00
Jaime van Kessel	bb991e1e2c	Fix the formula for support_enable and support_extruder_nr ... The formulas got mixed up somehow. Shows that devs shouldn't commit before their morning coffee ;) CURA-10633	2023-06-06 11:34:28 +02:00
Jelle Spijker	18653d9ef4	Use SHA of the commit instead of no_commits since last tag ... We determine the version of a conan package based on a Git tag and then count the number of commits between the last tag and the current tag to get the +testing_6 or +testing_13 after the alpha/beta designation etc. This will give us logical sequential numbers with which we can determine which version was later. But the method can't take into account tags created on release branches, a branch parallel to the main branch, once these are merged, after a tag then suddenly the first tag it encounters is closer then it was before, this means that we then accidentally create a second package with the same version and this starts tripping things up. Now these logical statements aren't necessary to determine the latest version, according to semver everything after the + is ignored and both versions should be compatible. An easy fix is to replace the testing_<no_of_commits_since_last_tag> with testing_<commit_hash> that way we don't have two conan packages created from different commits anymore, which is the most common root cause of our problems in this flow.	2023-06-06 08:33:03 +02:00
Jelle Spijker	ee0e55cf97	Bump up fdmprinter and fdmextruder	2023-06-05 11:51:25 +02:00
Jelle Spijker	775266812b	Merge pull request #15661 from Ultimaker/CURA-10617_new_logo ... Update the logo	2023-06-05 11:26:10 +02:00
Jelle Spijker	e3a4c84463	Merge remote-tracking branch 'origin/PP-336_Cleanup_infill_overlap_settings' ... # 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-05 11:09:16 +02:00
Jelle Spijker	ba5cd429c0	Merge pull request #15632 from Ultimaker/PP-81_Easy_to_tear_of_brim ... PP-81 easy to tear of brim	2023-06-05 10:56:39 +02:00
Jelle Spijker	e75d7f07f7	Merge pull request #15525 from Ultimaker/PP-321_Cleanup_skin_overlap_settings ... Cleanup skin overlap settings	2023-06-05 10:18:37 +02:00
Jelle Spijker	b07e21cb1a	Merge remote-tracking branch 'origin/main' into PP-321_Cleanup_skin_overlap_settings ... # 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-05 10:18:03 +02:00
Jelle Spijker	e3cbc37740	fixed mapping of support extruder nr ... Contributes to PP-285 and CURA-10643	2023-06-05 09:16:56 +02:00
Jelle Spijker	20c2b2b4cd	Revert mapping value ... Currently fails, will fix this after the weekend Contributes to PP-285 and CURA-10643	2023-06-02 17:35:08 +02:00
Jaime van Kessel	e691d3d052	Update the logo ... CURA-10617	2023-06-02 17:15:46 +02:00
Jelle Spijker	dd66dc0ba9	Merge pull request #15633 from Ultimaker/PP-285_Add_support_materials_tag ... Added material_is_support_material setting	2023-06-02 16:25:37 +02:00
Jelle Spijker	545914ca84	Merge branch 'main' into PP-285_Add_support_materials_tag	2023-06-02 16:03:18 +02:00
Jelle Spijker	f5a6a34493	Merge pull request #15353 from Ultimaker/PP_328_Increase_speed_bottom_interface_layer ... Faster bottom interface speed	2023-06-02 15:46:15 +02:00
Jelle Spijker	d7aa3d5dc9	Merge branch 'main' into PP_328_Increase_speed_bottom_interface_layer	2023-06-02 15:42:31 +02:00
Remco Burema	7115cc35ed	Merge pull request #15651 from Ultimaker/PP-340_Filled_material_profiles ... Profiles for filled material	2023-06-02 14:52:25 +02:00
nallath	68b51e842d	update translations	2023-06-02 11:57:59 +00:00
Jaime van Kessel	b9758886c7	Merge branch 'main' of github.com:Ultimaker/Cura	2023-06-02 13:52:32 +02:00
Jaime van Kessel	d8a88739a6	Ensure that menu items for extruder are added to right spot in context menu ... Fixes CURA-10649	2023-06-02 13:51:43 +02:00
Jaime van Kessel	b89a8dbe0e	Update CONTRIBUTING.md ... Remove stray *	2023-06-02 11:56:40 +02:00
Jaime van Kessel	5589faf196	Update CONTRIBUTING.md ... Update outdated information on Contributing	2023-06-02 11:56:09 +02:00
Jaime van Kessel	25e94b9adf	Rename contributing.md to CONTRIBUTING.md ... Seems like that this is needed for GH to pick it up as the contribution readme.	2023-06-02 11:52:05 +02:00
Paul Kuiper	8e8e64f37b	Added PET-CF quality and intent profiles. ... Relates to: PP-340	2023-06-01 17:53:51 +02:00
c.lamboo	bba1362bad	Fix um s5 initially not showing up in printer list ... CURA-10627	2023-05-31 13:30:26 +02:00
c.lamboo	27cc89ff89	Allow for custom descriptions/icons in packaged intents ... CURA-9709	2023-05-31 12:54:56 +02:00
pkuiper-ultimaker	52bbd750b9	update translations	2023-05-30 15:32:13 +00:00
Paul Kuiper	34b57fb203	Added material_is_support_material setting and added a resolve function to select the correct support_extruder. ... Relates to: PP-285	2023-05-30 17:27:25 +02:00
Frederic98	afc36fbfd9	Applied printer-linter format	2023-05-30 15:24:43 +00:00
Frederic Meeuwissen	eb2aa80ffa	PP-81: Set brim_gap to horizontal expansion + 50um	2023-05-30 17:22:33 +02:00
Mariska	af12166595	Decreased frequency - Increased Operations ... Changes made - Decreased the frequency to ~4 hours during working hours - Increased the Actions by a lot to process all issues - Changed the ordering to Ascening to address the oldest issues first.	2023-05-30 10:17:01 +02:00
Mariska	781276bba2	Increased Operations per Run ... Only half of the issues seem to be addressed with the default value of 30. Increasing it to double + a margin.	2023-05-26 17:26:50 +02:00
Mariska	8bd288815d	Remove Won't fix label ... This is preventing the Only-Labels to work	2023-05-26 16:18:26 +02:00
Mariska	5411bcbb32	Update frequency ... Now run every 10 minutes.	2023-05-26 16:01:01 +02:00
Mariska	b088514f07	Remove vacancies ... Positions have been filled	2023-05-26 15:36:23 +02:00
Mariska	82d9486800	Introduce a Stale bot ... Helps with cleaning the issue list and introducing old tickets to the new triage system.	2023-05-26 15:08:50 +02:00