3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
32517 commits 313 branches 275 tags 719 MiB
Commit graph

32517 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jelle Spijker
0fc507e556
Merge branch 'main' into CURA-10475_engineplugin 2023-08-07 16:01:21 +02:00
Casper Lamboo
84bcdc3bf4
Merge pull request #16331 from Ultimaker/CURA-10770_Developer_about_dialog 
Fixed for all the used python packages in venv
 2023-08-07 14:28:15 +02:00
Jelle Spijker
c6fb3fe59c
Merge branch 'main' into CURA-10475_engineplugin 2023-08-07 09:05:15 +02:00
Jelle Spijker
ce82033f6a
exclude the correct conan versions 2023-08-07 08:21:03 +02:00
Remco Burema
b1100cb4c5 Relevant comment specifically requests not to call closeApplication in most cases. 
done as a 5 min fix.
 2023-08-04 15:53:52 +02:00
Remco Burema
6a65be4109
Merge pull request #16385 from Ultimaker/CURA-10116-connected_printers_list_after_click 
Clicking Show all connected printers shows all cloud printers offline…
 2023-08-04 15:08:43 +02:00
saumya.jain
fc9a228062 Deleting Shake detection 
CURA-10770
 2023-08-04 14:24:38 +02:00
saumya.jain
f9981d3df1 Clicking Show all connected printers shows all cloud printers offline and online 
CURA-10770
 2023-08-04 14:14:08 +02:00
Remco Burema
401e1eca6a
Merge pull request #16296 from Ultimaker/CURA-10719_show_missing_plugins 
Show install missing packages button in open workspace dialog for plugins
 2023-08-04 10:43:12 +02:00
Casper Lamboo
ae8240659c
Merge pull request #16305 from Ultimaker/CURA-10722_plugins_can_has_settings 
[CURA-10722] backend plugins are always (potential) additional setting definition providers
 2023-08-03 14:12:50 +02:00
Casper Lamboo
4f2b038a59
Use "PLUGIN" as default appender_type 2023-08-03 13:04:14 +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
c.lamboo
83d35ccd8b Use pytest fixtures 
CURA-10719
 2023-08-02 14:46:37 +02:00
c.lamboo
c436dd36cf Add unit test 
CURA-10719
 2023-08-02 14:03:55 +02:00
saumya.jain
a6780b5417 Review comments fixed 
CURA-10770
 2023-08-02 10:45:02 +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
saumya.jain
1442031e28 Review comments fixed 
CURA-10770
 2023-08-02 09:24:42 +02:00
Jelle Spijker
730dec8d86
Merge branch 'main' into CURA-10475_engineplugin 2023-08-01 15:58:02 +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
0f7b092507
Allow for using Conan 1.60 
Contributes CURA-10475
 2023-08-01 07:47:51 +02:00
Jelle Spijker
f9d4eb9554
Sync Cura.proto with other repo's 
Contributes CURA-10475
 2023-08-01 07:47:22 +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
Casper Lamboo
9b6abf80d7
Capitalize first word of comment comment 
CURA-10719

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2023-07-31 17:10:06 +02:00
Casper Lamboo
e3d482514b
Use camelCase for python function definition 
CURA-10719

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2023-07-31 17:09:27 +02:00
Casper Lamboo
b1797111d5
Update message id to properly reflect action 
CURA-10719
 2023-07-31 17:06:58 +02:00
saumya.jain
e686baaf92 Fixed for all the used python packages in venv 
CURA-10770
 2023-07-31 11:47:15 +02:00
Remco Burema
4c82098745 Backend-plugins don't have to register separately for extra setting-defs. 
Also they now have their own appender-type (previously it was _always_ 'PLUGIN', now the other plugins are 'EXTRA').

part of CURA-10722
 2023-07-28 15:13:48 +02:00
Remco Burema
7c810eeca8 Ease of use; each backend-plugin can now provide additional settings. 
Any overriding cals that does so, should just add 'self.definition_file_paths' to load their additional settings. However, at the moment of this commit, you should still suppy setting_definitions_appender in the list of __init__.register for the plugin.

part of CURA-10722
 2023-07-28 14:52:56 +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 3521947fef.
 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