3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
32753 commits 313 branches 275 tags 718 MiB
Commit graph

32753 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jelle Spijker
c5e3821116
Fix the AppImage-builder scripts 
Contributes CURA-10951
 2023-09-05 06:12:47 +02:00
Jelle Spijker
f1df7f67d5
deploy packaging scripts 
Contributes CURA-10951
 2023-09-05 05:20:34 +02:00
Jelle Spijker
b5fbcce33f
Add AppImage builder configs and scripts 
Added the configuration file `AppImageBuilder.yml.jinja`, the Python script `create_appimage.py`, and the shell script
`entrypoint.sh.jinja` for AppImage building and packaging. These additions would enable the Cura application to be built
into a single, standalone, executables file for Linux users, improving software deployment and distribution.

Contributes CURA-10951
 2023-09-05 05:13:21 +02:00
Jelle Spijker
7fbd716bb4
Bundling the Gradualflow plugin 
This commit simplifies the deploy method in conanfile.py by reducing the number of lines of code and refactor the
handling of the Gradualflow plugin in the deploy method. In conandata.yml, the paths for the Gradualflow plugin
resources have been adjusted for correct deployment. This update aims to fix the pyinstaller deployment failures
associated with the Gradualflow plugin. It resolves the CURA-10951 tracking issue.

Contributes CURA-10951
 2023-09-05 05:11:51 +02:00
Jelle Spijker
e5aab096e9
Add AppImage-builder and dependencies 
Contributes CURA-10951
 2023-09-01 07:51:52 +02:00
Jelle Spijker
59ce5a6c49
Don't build on linux-legacy 
Contributes CURA-10951
 2023-09-01 07:37:34 +02:00
jellespijker
5cf2ecc666 Only use shared grpc defs on Linux 
Contributes to CURA-10951
 2023-08-31 08:40:11 +02:00
jellespijker
f958d69f1c Override zlib version to 1.2.13 
fixes incompatible mismatch in versions between pyarcus and protobuf

Contributes to CURA-10951
 2023-08-31 06:17:15 +02:00
jellespijker
f2948338ae Use shared curaengine_grpc_definitions 
Although not a direct dependency of Cura, still need to define it here,
such that we can set it as shared for all dependencies.
Needed to overcome the issues with glibc and static compiling of the
gradual flow plugin on ubuntu 20.04 with gcc-13

Contributes to CURA-10951
 2023-08-31 06:01:16 +02:00
Jelle Spijker
3305044b74 Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage 2023-08-31 05:57:22 +02:00
jellespijker
fc1135d919 Use CURA-10475 engine conan package 
Contributes to CURA-10951
 2023-08-31 05:56:46 +02:00
Jelle Spijker
8cf334b45f Merge branch 'main' into CURA-10475_engineplugin 
# Conflicts:
#	.github/workflows/linux.yml
 2023-08-31 05:54:51 +02:00
jellespijker
baafdbfce3 Use gcc-13 and new conan-config 2023-08-31 05:45:44 +02:00
jellespijker
1fb7191dd7 Use conf skip_test 
Contributes to CURA-10951
 2023-08-31 05:26:40 +02:00
c.lamboo
d2cd759e51 Merge branch 'main' into CURA-10951_gh_build_curapackage 2023-08-30 20:23:40 +02:00
c.lamboo
4f06ea4f87 Merge branch 'main' into CURA-10475_engineplugin 2023-08-30 20:23:21 +02:00
Jelle Spijker
2d389a6819 Windows packaging 
Contributes to CURA-10951
 2023-08-30 16:51:56 +02:00
Remco Burema
fa08848152
Merge pull request #15496 from Ultimaker/CURA-7951_lock_rotation 
Add option to arrange in grid
 2023-08-30 13:31:42 +02:00
Jelle Spijker
c62e392c81 use Windows slashes on Windows 
Contributes to CURA-10951
 2023-08-30 13:09:22 +02:00
c.lamboo
586739c547 Avoid bool-trap 
CURA-7951
 2023-08-30 13:06:19 +02:00
Jelle Spijker
c30c403a65 Don't exclude 
Contributes to CURA-10951
 2023-08-30 13:04:01 +02:00
c.lamboo
afc1ba78f5 Remove debugging utility function 
CURA-7951
 2023-08-30 12:52:27 +02:00
c.lamboo
3e39bbdabd Typo 
CURA-7951
 2023-08-30 12:51:03 +02:00
c.lamboo
38a5754c6f Mark method functions as private 
CURA-7951
 2023-08-30 12:47:56 +02:00
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
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
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