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
Jelle Spijker
89a3fe3072
Merge branch 'main' into main
2023-08-01 13:28:35 +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
saumya.jain
e686baaf92
Fixed for all the used python packages in venv
...
CURA-10770
2023-07-31 11:47:15 +02:00
Jaime van Kessel
202d802f61
Move the required plugins list to before it's actually checked
...
Cuz ya know. If you don't set the data before checking, you will have a baaaad time.
2023-07-28 13:46:04 +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
Eazao
3176cae953
Add new 3D printer Eazao M500, M600, M700 to Cura
2023-07-27 11:31:19 +08:00
Eazao
418b9de153
Add new 3D printer Eazao M500, M600, M700 to Cura
2023-07-27 11:31:00 +08:00
Eazao
b19f262c2e
Delete eazao_m500.def.json
2023-07-27 11:30:11 +08:00
Eazao
3a4bbd1e06
Delete eazao_m500_extruder_0.def.json
2023-07-27 11:30:01 +08:00
Eazao
34d4081794
Update eazao_m500.def.json
2023-07-26 23:42:27 +08:00
Eazao
9896420af3
Rename eazao_matrix_extruder_0.def.json to eazao_m500_extruder_0.def.json
2023-07-26 23:40:52 +08:00
Eazao
9b1c01a145
Update eazao_matrix_extruder_0.def.json
2023-07-26 23:39:24 +08:00
Eazao
1c397e7101
Update eazao_m500.def.json
2023-07-26 23:39:02 +08:00
Eazao
2b2387c87b
Update eazao_m500.def.json
2023-07-26 23:10:13 +08: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
Eazao
d8ef5255f1
Add files via upload
2023-07-26 22:43:02 +08:00
Eazao
e84c30580f
Delete eazao_m500.def.json
2023-07-26 22:42:47 +08:00
Eazao
8bf03e548a
Add files via upload
2023-07-26 22:29:50 +08:00
Eazao
1a6ddd9ff0
Add files via upload
2023-07-26 22:29:18 +08:00
Eazao
f589bc8f20
Delete eazao_matrix_extruder_0.def.json
2023-07-26 22:28:51 +08:00
Eazao
f27fed1647
Delete eazao_m500.def.json
2023-07-26 22:28:22 +08:00
Eazao
d6a78abcc7
Add new 3D printer Eazao Matrix extruder to Cura
2023-07-26 22:06:07 +08:00
Eazao
0e008064d1
Add new 3D printer Eazao M500, M600, M700 to Cura
2023-07-26 22:05:23 +08: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
