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
33,010 Commits 290 Branches 260 Tags
Commit Graph

33010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jelle Spijker
81b2aeaf4e
Merge branch 'main' into CURA-9494_nightly 2023-08-29 22:52:54 +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