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

32698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
447aca36d8 Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage 2023-08-30 09:22:02 +02:00
Jelle Spijker
28ffdcbcb7
Merge pull request #16612 from Ultimaker/win_stop_backend_plugins 
[Windows?] Engine-plugins wouldn't always close.
 2023-08-30 09:18:47 +02:00
Jelle Spijker
8d811273a2
Merge branch 'CURA-10475_engineplugin' into win_stop_backend_plugins 2023-08-30 07:14:30 +02:00
Remco Burema
015e635213 Engine-plugins wouldn't always close. 
... because the code to terminate them wasn't always called. Especially annoying on Windows, since the sub-program could aparently become a zomboid after termination of the main one(s).

I guess this is still part of the still open CURA-10475 'branch' in a way? There is no other ticket that fits at the moment.
 2023-08-29 22:46:35 +02:00
Jelle Spijker
1d731899b5 Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage 2023-08-29 17:46:48 +02:00
Jelle Spijker
ae2e1ec314 Merge branch 'main' into CURA-10475_engineplugin 
# Conflicts:
#	.github/workflows/requirements-conan-package.txt
#	conanfile.py
 2023-08-29 17:44:50 +02:00
Jelle Spijker
d3809f8bd7 Still a header only 
Contributes to CURA-10951
 2023-08-29 16:18:47 +02:00
Jelle Spijker
87b6ad63a7 Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage 
# Conflicts:
#	conanfile.py
 2023-08-29 16:13:39 +02:00
saumya.jain
d80e349f0b source_folder as root for materials 
conan build fix
 2023-08-29 15:27:47 +02:00
Jelle Spijker
2f2b88fd24 Use the source_folder as a rootfor materials 
Contributes to CURA-10951
 2023-08-29 15:25:32 +02:00
saumya.jain
0397095789 pyarcus pynest2d and pysavitar version changed 
conan build fix
 2023-08-29 15:18:59 +02:00
c.lamboo
6e045e8b37 Put back getAnyExtruderPositionWithOrDefault api function 
CURA-10685
 2023-08-29 14:11:36 +02:00
saumyaj3
ef4665a55f Applied printer-linter format 2023-08-29 11:12:17 +00:00
Saumya Jain
577f34782b
Merge pull request #16159 from randyzwitch/main 
Definition: Pulse XE E444M
 2023-08-29 13:10:58 +02:00
Jelle Spijker
89fe3d2777 Don't use the import method 
This will be deprecated, since we are also using self.dependencies we
should do this in the generate.

Contributes to CURA-10951
 2023-08-29 13:07:23 +02:00
Casper Lamboo
f3b2a05f49
Merge pull request #16589 from Ultimaker/CURA-10685_improve_ui_performance 
CURA-10685_improve_ui_performance
 2023-08-29 10:55:41 +02:00
Saumya Jain
70e858ecb6
Merge pull request #16592 from Ultimaker/CURA-10446_modify_gcode_path 
Add slot for gcode path modify
 2023-08-29 10:30:43 +02:00
Jelle Spijker
df9e4564d2 Merge branch 'CURA-10446_modify_gcode_path' into CURA-10951_gh_build_curapackage 
# Conflicts:
#	.github/workflows/requirements-conan-package.txt
#	conanfile.py
 2023-08-29 10:17:41 +02:00
Jelle Spijker
8a4dd000f1 Use pysavitar from CURA-10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 09:26:08 +02:00
Jelle Spijker
ea43f61ae4 Use pynest from CURA-10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 09:03:39 +02:00
Jelle Spijker
2f166a545c Use pyarcus from CURA-10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 08:25:35 +02:00
Jelle Spijker
7cb2e96b63 Use pyarcus 10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 08:24:01 +02:00
Jelle Spijker
3d48e51ac2
Update requirements-conan-package.txt 2023-08-29 07:53:35 +02:00
Jelle Spijker
b648eddfd7
Update requirements-conan-package.txt 2023-08-28 17:33:15 +02:00
Jelle Spijker
72db652aec
Update requirements-conan-package.txt 2023-08-28 17:32:45 +02:00
Jelle Spijker
d70b209288
Update requirements-conan-package.txt 2023-08-28 17:32:03 +02:00
Jelle Spijker
c335447292
Update requirements-conan-package.txt 2023-08-28 16:37:09 +02:00
Jelle Spijker
7671705c16
Update requirements-conan-package.txt 2023-08-28 16:35:27 +02:00
Jelle Spijker
d7a218b302
Bundle the gradualflow plugin 
Contributes CURA-10466
 2023-08-28 15:36:46 +02:00
Jelle Spijker
608878d7be
Update macos.yml 2023-08-28 15:21:09 +02:00
Jelle Spijker
2b39c73d56
Update linux.yml 2023-08-28 15:20:17 +02:00
Jelle Spijker
0e67ff38c2
Update windows.yml 2023-08-28 15:19:45 +02:00
c.lamboo
93b10cb770 Revert "Update conan version" 
This reverts commit 413aa181ff782de33ffc971f20691a8b2ba9d682.
 2023-08-28 14:49:51 +02:00
c.lamboo
0362f8abe6 Revert "Update conan version" 
This reverts commit 711b4401007cbbcf7455c60114a63d8ee7976049.
 2023-08-28 14:42:04 +02:00
Jelle Spijker
247025ffc4
Use curaengine from cura_10446 
Contributes CURA-10466
 2023-08-28 13:49:40 +02:00
c.lamboo
711b440100 Update conan version 
CURA-10446
 2023-08-28 13:00:08 +02:00
c.lamboo
413aa181ff Update conan version 
CURA-10446
 2023-08-28 12:42:16 +02:00
c.lamboo
ffe6447244 Merge branch 'CURA-10475_engineplugin' into CURA-10446_modify_gcode_path 2023-08-28 10:43:37 +02:00
c.lamboo
2ffcfa37e9 Merge branch 'main' into CURA-10475_engineplugin 2023-08-28 10:42:23 +02:00
Saumya Jain
95aec61de9
Merge pull request #16555 from Ultimaker/CURA-10307_expand-one-at-a-time-shadow 
CURA-10307_expand-one-at-a-time-shadow
 2023-08-25 17:24:53 +02:00
Casper Lamboo
e3b29b9ad5
Merge pull request #16556 from Ultimaker/CURA-10180-warning_out_of_space 
CURA-10180-warning_out_of_space
 2023-08-25 17:09:09 +02:00
saumya.jain
ab8b7c3ab5 name changes 
CURA-10685
 2023-08-25 15:46:30 +02:00
saumya.jain
2c6e3fb813 Merge branch 'CURA-10685_improve_ui_performance' of https://github.com/Ultimaker/Cura into CURA-10685_improve_ui_performance 2023-08-25 11:58:35 +02:00
saumya.jain
9129a526ba improve number of iterations 
CURA-10685
 2023-08-25 11:58:27 +02:00
Erwan MATHIEU
281e543255 Remove exported file after fail 
CURA-10180
 2023-08-25 11:27:54 +02:00
Erwan MATHIEU
eee1eb714b Fixed TiZYX machines head polygon definition 2023-08-24 11:17:21 +02:00
Erwan MATHIEU
09d4f083e0 Include adhesion for 1-at-a-time exclusion shadow 
CURA-10307
 2023-08-24 11:15:34 +02:00
Casper Lamboo
fce35b78c4
Merge pull request #16516 from Ultimaker/CURA-8415_self_hosted_runner 
CURA-8415 Update installers and added self-hosted installer
 2023-08-23 11:43:18 +02:00
Casper Lamboo
9000730ce7
use template strings 2023-08-23 11:39:54 +02:00
c.lamboo
1f6c096bf7 Don't omit printers in printer list 
Since the message is now scrollable we can do this :)
 2023-08-22 16:42:34 +02:00