32821 Commits

Author SHA1 Message Date
Remco Burema
9a768acfa4
Merge pull request #16607 from Ultimaker/CURA-10951_gh_build_curapackage
CURA-10951 build plugin as bundled plugin on the GH runners
2023-09-08 23:05:33 +02:00
Remco Burema
2de0a9711a Require packages from main branches instead of from CURA-10915. 2023-09-08 22:52:41 +02:00
Remco Burema
fbd5569089 Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage 2023-09-08 18:39:27 +02:00
Remco Burema
e3f8c8d2ae Put scheduled build back to early morning. 2023-09-08 08:54:33 +02:00
Remco Burema
bb57220756 Fix scheduled build.
... but skip mac for now. Try out in about 15 minutes, after that I'll put it back to 5 o'clock.

related to CURA-9494
2023-09-08 08:07:34 +02:00
Remco Burema
4dbae3dea6
Merge pull request #16523 from Ultimaker/CURA-9494_nightly
CURA 9494 nightly builds
2023-09-07 22:55:50 +02:00
Remco Burema
13962a563e Make sure there is at least one run-info.
part of CURA-9494
2023-09-07 22:38:11 +02:00
Remco Burema
e1f2424f0e Should run nightly part even if some OS is skipped.
part of CURA-9494
2023-09-07 22:15:30 +02:00
Remco Burema
e9fe6b9831 Partial revert of unneeded code.
It doesn't work out this way, and, due to the if-clause further on, it should work even if the 'need's aren't all met.

part of CURA-9494
2023-09-07 21:10:46 +02:00
Remco Burema
566fdfce1c Whitespace can be important.
part of CURA-9494
2023-09-07 20:51:56 +02:00
Remco Burema
a35ce3d652 Use single quotes or 'if' doesn't work.
part of CURA-9494
2023-09-07 20:48:33 +02:00
Remco Burema
13af77b4f6 Nightlies workflow: Enable skipping OS's
part of CURA-9494
2023-09-07 20:34:54 +02:00
Remco Burema
c716ff8dfe Merge branch 'main' into CURA-9494_nightly 2023-09-07 13:09:49 +02:00
Remco Burema
5765f398a3 Add clarifying comments: Why .sh 'on' Windows?
part of CURA-9494
2023-09-07 13:03:56 +02:00
Remco Burema
c7356ccb4a Pass 'all' exceptions.
part of CURA-10942
2023-09-06 21:17:15 +02:00
Remco Burema
40cc6c7cde
Merge pull request #15954 from GregValiant/LimitXYAccel
Create LimitXYAccelJerk.py
2023-09-06 21:06:48 +02:00
c.lamboo
71dc8e22a6
Allow objects to be placed near border
Issue before was the following: when placing objects within a grid cell there is a margin around the object. This margin comes from both the integer rounding of the cell and the defined min distance between objects. When trying to place object near the buildplate border we marked any cell that is not fully within the buildplate area as an invalid cell to place objects in. This was however too strict; there is the aforementioned margin around the object, and if only this margin would be outside the buildplate it is perfectly fine to place object in that cell.

CURA-7951
2023-09-06 16:53:02 +02:00
Jelle Spijker
2bc3079af5 Only exclude Cura and CuraEngine
still ship other executables

Contributes to CURA-10951
2023-09-06 11:38:54 +02:00
Remco Burema
95530b5779
Merge pull request #16637 from Ultimaker/CURA-7951
Allow objects to be placed near border for grid arrange
2023-09-05 12:32:00 +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
c.lamboo
68806f4226 Allow objects to be placed near border
Issue before was the following: when placing objects within a grid cell there is a margin around the object. This margin comes from both the integer rounding of the cell and the defined min distance between objects. When trying to place object near the buildplate border we marked any cell that is not fully within the buildplate area as an invalid cell to place objects in. This was however too strict; there is the aforementioned margin around the object, and if only this margin would be outside the buildplate it is perfectly fine to place object in that cell.

CURA-7951
2023-09-01 11:11:09 +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