GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-04 14:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,497 Commits 295 Branches 268 Tags
Commit Graph

32497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
415d2481d3
Update README.md 2023-08-09 23:44:01 +02:00
Jelle Spijker
16ce595a15
Merge pull request #16383 from Ultimaker/CURA-7913 
Add copy, paste, cut functionality
 2023-08-09 14:37:12 +02:00
Jelle Spijker
c898c70bfc Merge branch 'main' into CURA-7913 2023-08-09 14:18:38 +02:00
Casper Lamboo
2aa66b5ebd
Merge pull request #16427 from Ultimaker/CURA-10770_Developer_about_dialog 
testing for build
 2023-08-09 10:01:09 +02:00
Casper Lamboo
7a25043ef8
Merge pull request #16413 from Ultimaker/CURA-10503_Brim_distance_per_object_removed 
Brim distance is not "settable_per_mesh"
 2023-08-09 08:56:57 +02:00
saumya.jain
f2a1830ad9 testing for build 
CURA-10770
 2023-08-08 15:05:53 +02:00
Saumya Jain
16204aa64f
Merge pull request #16423 from Ultimaker/CURA-10770_Developer_about_dialog 
from deploy field.
 2023-08-08 13:54:17 +02:00
saumya.jain
64a77440da from deploy field. 
CURA-10770
 2023-08-08 13:42:31 +02:00
Jelle Spijker
fc916beeec
Merge pull request #16097 from Ultimaker/PP-10_Support_interface 
Enable support interface

Contributes to CURA-10824
 2023-08-08 13:34:53 +02:00
Jelle Spijker
e52b5625a0
Merge branch 'main' into PP-10_Support_interface 2023-08-08 13:33:11 +02:00
Jelle Spijker
63bc3cc996
Renamed pla quality to normal 
Contributes CURA-10885
 2023-08-08 13:29:20 +02:00
jellespijker
fd97dd5d0c Applied printer-linter format 2023-08-08 11:25:29 +00:00
Jelle Spijker
916dc29d61
Merge pull request #15590 from Jordonbc/main 
Added Kobra Plus printer profile

Fixes CURA-10885
 2023-08-08 13:24:22 +02:00
c.lamboo
511f05c392 Don't arrange in paste when no objects were present in the clipboard 
CURA-7913
 2023-08-08 12:27:51 +02:00
c.lamboo
c393d915d7 Disable copy paste when either 3mf reader or writer is disabled 
CURA-7913
 2023-08-08 12:17:08 +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
c.lamboo
f8b3fb3d67 Move parse/write responsibility of copy/paste to 3MFWriter/3MFReader 
CURA-7913
 2023-08-07 13:41:01 +02:00
saumya.jain
476f92bd1c Brim distance is not "settable_per_mesh" 
A new feature request needed to make this work.
CURA-10770
 2023-08-07 12:40:05 +02:00
Jelle Spijker
ce82033f6a
exclude the correct conan versions 2023-08-07 08:21:03 +02:00
c.lamboo
cc1b42e2fa Merge branch 'main' into CURA-7913 2023-08-04 16:21:07 +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
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
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
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
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
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