32466 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
c.lamboo	f07faac422	Add copy, paste, cut functionality ... CURA-7913	2023-08-04 13:24:06 +02:00
Mariska	f71f39f8bd	Merge pull request #16365 from Ultimaker/revert-15470-main ... Revert " Create new machine named Renkforce 10+" Not all nozzle sizes have quality types associated to them and it results in Configuration Not Supported Error. CURA-10895	2023-08-02 16:40:42 +02:00
Mariska	9c7f14d00d	Revert " Creat new machine named Renkforce 10+"	2023-08-02 16:21:19 +02:00
Mariska	596914c9c6	Merge pull request #15470 from goofoo3d/main ... Creat new machine named Renkforce 10+ CURA-10895	2023-08-02 10:43:12 +02:00
MariMakes	60dba90cb5	Applied printer-linter format	2023-08-01 13:27:47 +00:00
Mariska	08bfb5a002	Merge pull request #15992 from thomaspleasance/main ... Added Creality Ender-5 S1 Definition For internal reference CURA-10888	2023-08-01 15:26:30 +02:00
rburema	2876a0e922	Applied printer-linter format	2023-08-01 11:54:38 +00:00
Remco Burema	b099a7c481	Merge pull request #15408 from zadi15/main ... Add new nozzle variants to Voron Trident	2023-08-01 13:53:36 +02:00
nallath	5ef0cbd945	Applied printer-linter format	2023-08-01 11:42:07 +00:00
Remco Burema	26cc3a894a	Merge branch 'main' into main	2023-08-01 13:33:50 +02:00
Jaime van Kessel	c574ee73a2	Merge branch 'main' of github.com:protosam/Cura	2023-08-01 13:33:31 +02:00
Remco Burema	38b98f1b13	Merge pull request #15847 from GregValiant/AnyCubicKossels ... Update AnyCubic Kossel Defs (remove disallowed areas)	2023-08-01 13:28:56 +02:00
Jaime van Kessel	b156adc3a5	Merge pull request #16017 from willuhmjs/patch-1 ... fix: kp3s pro author	2023-08-01 13:28:08 +02:00
nallath	d3027fa976	Applied printer-linter format	2023-08-01 11:27:33 +00:00
Jaime van Kessel	37d6128eb4	Merge pull request #15955 from PresentMonkey/patch-1 ... Update Ender 3 Pro Profile to not Damage Bed	2023-08-01 13:26:29 +02:00
Jaime van Kessel	1560f528c7	Merge pull request #16173 from GregValiant/Creality3s1 ... Creality3s1	2023-08-01 13:19:16 +02:00
Jelle Spijker	765eb6dd8b	Merge pull request #16303 from Ultimaker/CURA-10741_allow_multiple_file_open ... Use correct value for multiple file open enum	2023-07-31 17:39:42 +02:00
Jelle Spijker	9920e0c182	Merge branch 'main' into CURA-10741_allow_multiple_file_open	2023-07-31 17:34:19 +02:00
Jaime van Kessel	8db49a1a9b	Merge branch 'main' of github.com:Ultimaker/Cura	2023-07-28 11:17:54 +02:00
Jaime van Kessel	d08e2bc018	Increased max conan version to 1.60.0 ... For some magical reason, i got issues with 1.56.0. It used to work but when I needed to do a conan install, it suddenly failed to install any python packages, claiming I didn't have openssl.	2023-07-28 11:16:51 +02:00
Jaime van Kessel	1d91eca483	Use correct value for multiple file open enum ... Previously we used the qdialog enum, which isn't the one you should use for the qml dialog. CURA-10741	2023-07-28 10:52:27 +02:00
c.lamboo	fa6961a450	Revert "Upload packages to jfrog" ... This reverts commit 3521947fefb72a9524b33e296b3b55cb9d6762a3.	2023-07-27 13:52:15 +02:00
Casper Lamboo	3521947fef	Upload packages to jfrog	2023-07-27 13:49:21 +02:00
Remco Burema	3d289d75f9	Merge pull request #16270 from Ultimaker/CURA-10583_force_left_to_right_setting_field ... Force left to right reading direction for numeric textfield	2023-07-26 16:43:25 +02:00
Casper Lamboo	e5f5011f82	Attempt to fix build	2023-07-26 11:00:40 +02:00
Casper Lamboo	7d9858ccf8	Merge pull request #16235 from Ultimaker/CURA-10788_crash_on_material_with_shared_intent ... Let intent selection use the quality_definition instead of direct def	2023-07-26 09:08:17 +02:00
Casper Lamboo	112171937e	Merge pull request #16268 from Ultimaker/CURA-10770_Developer_about_dialog ... Cura about dialog when shaked gives extra info	2023-07-26 09:02:05 +02:00
saumya.jain	58048598b4	fixing Review Comments ... CURA-10770	2023-07-25 15:10:02 +02:00
Casper Lamboo	23d79de4b9	Make show custom button more visible in darkmode ... CURA-10782	2023-07-25 13:34:29 +02:00
Casper Lamboo	75085ccb1b	Merge pull request #16269 from Ultimaker/marketplace_search_api ... Update to add sort_by option	2023-07-25 13:31:33 +02:00
Casper Lamboo	7e2fc1ac5b	Update plugins/Marketplace/RemotePackageList.py	2023-07-25 13:29:22 +02:00
Casper Lamboo	8c54d44cbb	Apply suggestions from code review	2023-07-25 13:27:08 +02:00
Jaime van Kessel	86cb3851fe	Force left to right reading direction for numeric textfield ... CURA-10583	2023-07-25 13:20:26 +02:00
HellAholic	afc0f7c615	Update to add sort_by option ... Added a class attribute "last_updated" for sort_by Added an instance attribute for search_sort Added if statement to add the sort_by string, currently by default.	2023-07-25 13:11:43 +02:00
saumya.jain	0c7d0540b9	Cura about dialog when shaked gives extra info ... CURA-10770	2023-07-25 11:20:58 +02:00
Jelle Spijker	56b8205ce0	Revert "Fix wrong licenses" ... This reverts commit 8b8e96429339f7543c7cd0f50c710a3539b74258.	2023-07-23 17:48:11 +02:00
Jelle Spijker	13af2961de	Merge pull request #16237 from Ultimaker/CURA-10814_Fix_Missed_Licences ... Fix wrong licenses Fixes CURA-10814	2023-07-23 10:29:34 +02:00
Jaime van Kessel	b86b046433	Merge pull request #16239 from Ultimaker/CURA-10771-Update_Hole_Horizontal_Expansion_Max_Diameter_Tooltip ... Update description for Hole Horizontal expansion	2023-07-21 15:55:28 +02:00
MariMakes	08748b1a33	Update description for Hole Horizontal expansion ... Clarify relation with Hole Horizontal Expansion and ole Horizontal Expansion Max Diameter	2023-07-21 13:53:36 +02:00
MariMakes	8b8e964293	Fix wrong licenses ... These seem to be wrong by accident. Let's update them to reflect the rest of Cura which falls under the LGPLv3 or higher.	2023-07-21 11:34:02 +02:00
Jaime van Kessel	1e240e3229	Let intent selection use the quality_definition instead of direct def ... The issue was that sometimes intents are also shared. CURA-10788	2023-07-21 10:57:39 +02:00
Casper Lamboo	68cb603b91	Merge pull request #16201 from Ultimaker/CURA-10778_Add_Support_Type_To_Basic ... Add Support Structure to Basic	2023-07-19 10:18:41 +02:00
MariMakes	228a3e821e	Add Support Structure to Basic ... We show this setting in recommended, so it's safe to say we can show it in basic.	2023-07-18 12:06:26 +02:00
Thomas Pleasance	e2102ef6da	Merge branch 'main' into main	2023-07-18 08:46:22 +01:00
Jaime van Kessel	8ddec3f256	Merge pull request #16181 from Ultimaker/CURA-10758_skirt_distance_sent_when_adhesion_not_enabled ... Discription added in the tooltip about skirt presence even after disa…	2023-07-17 16:34:15 +02:00
Jelle Spijker	64e983abfa	Merge pull request #16183 from Ultimaker/exception_handler_scroll_to_end ... Automatically scroll down in crash handler	2023-07-17 14:34:26 +02:00
Jaime van Kessel	56cbd6b875	Merge pull request #16160 from randyzwitch/patch-1 ... Update PULL_REQUEST_TEMPLATE.md	2023-07-17 13:45:22 +02:00
Jaime van Kessel	62d3e1cf40	Automatically scroll down in crash handler ... It was reaaaaaly annoying me that people would post screenshots all the time. Those screenshots would never include the info you need, because it would only capture the top of the exception / logs.	2023-07-17 12:55:52 +02:00
saumya.jain	4d99dabefc	Discription added in the tooltip about skirt presence even after disabling it ... CURA-10758	2023-07-17 10:42:07 +02:00
GregValiant	7f04c326fb	Update creality_ender3s1plus.def.json ... Change the G28 O to a plain G28 for backward compatibility with firmware. Update Creality3s1 series startup gcode Removed the "G28 O ;Home all untrusted axes" Replaced with "G28 ; Home all axes" Some firmware will not accept the "O" parameter.	2023-07-16 14:23:31 -04:00