33010 Commits

Author SHA1 Message Date
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
Randy Zwitch
7613ebcaf0
Merge branch 'main' into main 2023-07-27 07:56:06 -04: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
c.lamboo
31cb11ce63 Update more copies
CURA-10719
2023-07-27 10:31:38 +02:00
c.lamboo
0e77a05c74 Correctly differentiate between plugins and materials in missing packages dialog
CURA-10719
2023-07-27 10:15:27 +02:00
c.lamboo
42002dac36 Update copy
Now more then just materials can be installed. Update copy to reflect this.

CURA-10719
2023-07-27 10:14:43 +02:00
c.lamboo
a1f02154f1 Add used backend plugins to 3mf metadata
These are appended to project metadata. A warning can now be shown to the user when trying to load a project file while the correct plugins are not installed. These missing plugins can concequently be downloaded from the marketplace. To show the warning and install missing package dialog the same system we use to install missing materials is used.

CURA-10719
2023-07-27 09:02:28 +02:00
c.lamboo
c15a53d349 Merge branch 'main' into CURA-10475_engineplugin 2023-07-26 16:58:20 +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
Jelle Spijker
fad3d09b95
specify boost version in root package
Solve version conflict with libnest2d
2023-07-18 12:41:34 +02:00
Jelle Spijker
cd08e6e3bf
Use pyarcus from branch CURA-10475 2023-07-18 12:31:02 +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
Jelle Spijker
982ba7e36b
Add log statement when starting plugin
Revert =

Contributes CURA-10475 and CURA-10625
2023-07-18 11:17:15 +02:00
Jelle Spijker
289b71cd9f
Use common cmdline practices for named args
Contributes CURA-10475 and CURA-10625
2023-07-18 11:11:27 +02:00
Thomas Pleasance
e2102ef6da
Merge branch 'main' into main 2023-07-18 08:46:22 +01:00
Jelle Spijker
3713207040
Merge branch 'main' into CURA-10475_engineplugin 2023-07-18 08:12:00 +02: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
Randy Zwitch
e05feb642f
Update PULL_REQUEST_TEMPLATE.md
When clicked from PR, the link is broken (Chrome, Windows 11). It appears that GitHub might be case-sensitive w.r.t URLs.
2023-07-15 13:18:31 -04:00
Randy Zwitch
d748e609f9
Add E444M extruder file 2023-07-15 13:08:08 -04:00
Randy Zwitch
61db7ce400
Add E444M definition file 2023-07-15 13:07:22 -04:00
Jelle Spijker
e51a4d0d22
Merge pull request #16144 from Ultimaker/usb_printing_debug_improvements
Usb printing debug improvements
2023-07-14 11:50:14 +02:00
Jaime van Kessel
9d72cc6aca
Update logging for autodetect baudrate 2023-07-14 11:45:04 +02:00
Jaime van Kessel
f5785cf235
Add serialport logging to autobaudjob 2023-07-14 11:42:44 +02:00
Jelle Spijker
129e0d04b0
Sync used SlotID
Contributes to CURA-10717 and CURA-10475
2023-07-14 09:27:39 +02:00