GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,784 Commits 290 Branches 260 Tags
Commit Graph

32784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
c.lamboo
b3b5ffbf55 Put try catch around actual arranging 
`arrange` is the function that _could_ fail

CURA-7951
 2023-08-30 12:45:34 +02:00
c.lamboo
cfc4db00a5 Use descriptive variable name 
instead of magic number

CURA-7951
 2023-08-30 12:41:53 +02:00
Erwan MATHIEU
6075a5b583 Make the "Add printer" window resizable 
CURA-10896
 2023-08-30 11:59:28 +02:00
Jelle Spijker
77483794e0 Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage 2023-08-30 11:36:33 +02:00
Remco Burema
0479efe637
Merge pull request #16615 from Ultimaker/CURA-10866_legacy_linux_compile_engine_plugins 
Compile engine plugins with GCC-13 on linux modern and legacy
 2023-08-30 11:35:46 +02:00
Jelle Spijker
4517364eb3 Copy the bundled external package info 
Contributes to CURA-10951
 2023-08-30 11:31:14 +02:00
jellespijker
0210b06fbb Pyinstaller package directories from the instal directory 
Contributes to CURA-10951
 2023-08-30 10:51:53 +02:00
jellespijker
eeb3050e08 Change the order of plugin deploy 
Contributes to CURA-10951
 2023-08-30 10:44:28 +02:00
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
jellespijker
0c9d802ab0 use gcc-13 
seems to be available for 20.04 as well: https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test

Contribute to CURA-10866
 2023-08-30 00:28:53 +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
Erwan MATHIEU
0450a3b09c Fixed possibly wrong error message 
CURA-10180
 2023-08-29 16:45:13 +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
Saumya Jain
81c44d8709
Merge branch 'main' into PP-370-Fix-horizonal-expansion-for-tree-support 2023-08-29 13:36:05 +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