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

32784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
2bc3079af5 Only exclude Cura and CuraEngine 
still ship other executables

Contributes to CURA-10951
 2023-09-06 11:38:54 +02:00
Jelle Spijker
7eedcac62f
Add includes for apt packages 
Based on: https://github.com/AppImageCrafters/appimage-builder/blob/main/recipes/hello-world-qt6/AppImageBuilder.yml

Contributes CURA-10951
 2023-09-05 08:37:24 +02:00
Jelle Spijker
c29fcd7dce
Skip the AppImage test 
Contributes CURA-10951
 2023-09-05 07:24:14 +02:00
Jelle Spijker
05cf1c9ad6
Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage 2023-09-05 07:06:30 +02:00
Jelle Spijker
43322ff249
Merge branch 'main' into CURA-10475_engineplugin 2023-09-05 07:05:57 +02:00
Jelle Spijker
e558b11ebd
Minor fixes 
Contributes CURA-10951
 2023-09-05 06:32:06 +02:00
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
Saumya Jain
e27779564a
Merge pull request #16626 from Ultimaker/CURA-10896_improve_add_printer_wizard 
CURA-10896_improve_add_printer_wizard
 2023-09-04 11:51:25 +02:00
Saumya Jain
f3c7b0f6f8
Merge branch 'main' into CURA-10896_improve_add_printer_wizard 2023-09-04 10:13:58 +02:00
Saumya Jain
6e781f4583
Merge pull request #16606 from Ultimaker/CURA-10180-warning_out_of_space 
Fixed possibly wrong error message
 2023-09-01 17:39:10 +02:00
Saumya Jain
683d4dbe69
Merge branch 'main' into CURA-10180-warning_out_of_space 2023-09-01 17:33:17 +02:00
Erwan MATHIEU
9e5ad281d5 Do not restore add printer dialog size 
CURA-10896
 2023-09-01 16:59:02 +02:00
Erwan MATHIEU
15243fd6f9 Remove QML warning at startup 
Using undefined works properly, but generates a warning. The other solution is to set the maximum size to something knowingly big.

CURA-10896
 2023-09-01 16:59:02 +02:00
Erwan MATHIEU
cb3d22a2c0 Use proper margin for gcode edition area 
CURA-10896
 2023-09-01 16:59:02 +02:00
Casper Lamboo
6ef4758a83
Merge pull request #16624 from Ultimaker/CURA-10835_make_setting_hidden_icon 
Icon is dragged into visible area
 2023-09-01 15:50:56 +02:00
Casper Lamboo
e064044298
Merge pull request #16638 from Ultimaker/CURA-11000_Update_Installation_Screen_Mac 
Update MacOS Installation Screen
 2023-09-01 15:32:24 +02:00
Saumya Jain
28d4bc677d
Merge pull request #16421 from Ultimaker/PP-370-Fix-horizonal-expansion-for-tree-support 
PP-370 Fix horizonal expansion for tree support
 2023-09-01 14:09:26 +02:00
Saumya Jain
26ddc1a9d6
Merge branch 'main' into PP-370-Fix-horizonal-expansion-for-tree-support 2023-09-01 13:22:24 +02:00
MariMakes
2b6b43efc0 Update MacOS Installation Screen 
We still had the temporary logo on this screen. Our designers created an updated version.
 2023-09-01 11:40:00 +02:00
Saumya Jain
4a8a8d35f6
Merge branch 'main' into CURA-10896_improve_add_printer_wizard 2023-09-01 11:17:18 +02:00
saumya.jain
5c2b127345 Few minor fixes 
CURA-10835
 2023-09-01 11:12:50 +02:00
Saumya Jain
012c77459c
Merge branch 'main' into CURA-10835_make_setting_hidden_icon 2023-09-01 11:06:46 +02:00
Erwan MATHIEU
6848974fcc Fix project write error not reported on Windows 
CURA-10180
 2023-09-01 10:14:17 +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
Erwan MATHIEU
c7fde54f3d Fix GCode text bug when resizing 
CURA-10896
 2023-08-30 16:42:59 +02:00
saumya.jain
cb4c4214f4 Icon is dragged into visible area 
CURA-10835
 2023-08-30 15:28:49 +02:00
Saumya Jain
bd4a6a1831
Merge branch 'main' into CURA-10180-warning_out_of_space 2023-08-30 14:02:58 +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
Erwan MATHIEU
742e11327e Allow the printers selection list to reize 
CURA-10896
 2023-08-30 13:17:20 +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