Commit graph

33567 commits

Author SHA1 Message Date
Casper Lamboo
6ebbf67c36
Merge branch 'main' into CURA-11279_fix_arrange_grid 2023-12-06 12:18:22 +01:00
c.lamboo
237d1a899b Revert "Use absolute transformation to set location for arrange"
This reverts commit 920809f064.
2023-12-06 12:10:34 +01:00
c.lamboo
920809f064 Use absolute transformation to set location for arrange
Using relative positioning proved to create issues; when spamming of arrange instructions it was possible to end up in the following time line
1: arrange action a is started
2: arrange action b is started
3: arrange action a finished computation, and applies transformations on the models
4: arrange action b finishes computation and applies relative transformations on top of the previous transformations

By using absolute positioning this issue is resolved

CURA-11279
2023-12-06 11:40:34 +01:00
c.lamboo
0353037b31 Use getWorldPosition for TranslateOperation
CURA-11279
2023-12-06 11:36:54 +01:00
Erwan MATHIEU
9a108dc720
Set explicit parameter name
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2023-12-05 14:41:15 +01:00
Erwan MATHIEU
68818a525d Use absolute transform coordinates instead of relative
CURA-11279
2023-12-05 13:53:30 +01:00
Jelle Spijker
ee1f1a1a82
Merge remote-tracking branch 'origin/CURA-11364_add_sentry_engine'
# Conflicts:
#	conanfile.py
2023-12-05 10:22:46 +01:00
c.lamboo
58c174ff68 pin dulcificum to 0.1.0-beta.2 2023-12-04 13:49:02 +01:00
c.lamboo
89be765841 Revert "unpin dulcificum"
This reverts commit ba9e122f6a.
2023-12-04 13:48:05 +01:00
c.lamboo
ba9e122f6a unpin dulcificum 2023-12-04 11:45:12 +01:00
Erwan MATHIEU
421f3ee5b5
Merge pull request #17488 from Ultimaker/CURA-11080_use_openssl_3
Cura 11080 use openssl 3
2023-12-04 10:45:41 +01:00
Erwan MATHIEU
7d04a988b1
Merge branch 'main' into CURA-11080_use_openssl_3 2023-12-04 10:09:56 +01:00
jellespijker
bffbded591 Override spdlog version 2023-12-01 17:42:27 +01:00
Jelle Spijker
10b69e801e
Openssl shared on Linux static for the rest
Contribute to CURA-11080
2023-12-01 07:51:31 +01:00
Jelle Spijker
b629669f77
Use sip<=6.7.12
6.8.0 seams to have bug which is botching up building pyArcus

Contribute to CURA-11080
2023-12-01 07:51:31 +01:00
c.lamboo
d93d66dd8a Use sentry cura engine version
CURA-11364
2023-11-30 13:45:21 +01:00
c.lamboo
1e190ebcb9 Format file
CURA-1364
2023-11-30 13:16:25 +01:00
Jelle Spijker
7573c3e994 Build OpenSSL 3 shared
No longer a need to deploy a shared dep
independently.

Contribute to CURA-11080
2023-11-30 12:58:47 +01:00
Jelle Spijker
ef5bc6d3d5 Use custom CPython 3.10.4 and OpenSSL 3.2.0
Due to changes made to the recipes up stream,
and some tweaks to our own cpython recipe.

We can now build cpython with the newest OpenSSL version

Contribute to CURA-11080
2023-11-30 12:57:14 +01:00
c.lamboo
b9f8ef9bc2 Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 11:02:46 +01:00
c.lamboo
29193d833c Revert "enable_sentry in install commands"
This reverts commit 2f452c6581.
2023-11-30 11:01:51 +01:00
c.lamboo
d00c3fea78 Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 10:25:32 +01:00
c.lamboo
a87ad75edc Merge remote-tracking branch 'origin/main' 2023-11-30 10:02:01 +01:00
c.lamboo
2f452c6581 enable_sentry in install commands 2023-11-30 10:01:20 +01:00
Casper Lamboo
1dc350012d
Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 09:29:47 +01:00
Jelle Spijker
ff19142fdf
Don't try to copy non existing openssl
Contributes to CURA-10831
2023-11-30 07:16:15 +01:00
Jelle Spijker
b65cd0181f Disable shared openssl for Windows
Temp fix

Contributes to CURA-10561
2023-11-29 22:14:18 +01:00
Jelle Spijker
ac55306d0b
Use Dulcificum 0.1.0-beta.1 2023-11-29 18:44:11 +01:00
Jelle Spijker
1a945fe066
Update linux.yml 2023-11-29 17:04:58 +01:00
Jelle Spijker
319d478a9a
Merge pull request #17422 from Ultimaker/remove-luts
Clean up bot LUT
2023-11-29 15:09:09 +01:00
Jelle Spijker
6b3d7d0f2c
Update conan-package.yml 2023-11-29 13:57:06 +01:00
nallath
8b0e914abb Applied printer-linter format 2023-11-29 12:49:59 +00:00
Jaime van Kessel
3165b54624
Fix typo 2023-11-29 13:49:02 +01:00
Jaime van Kessel
6d6989c95c
Merge branch 'PP-363_Fix_broken_definitions' of github.com:Ultimaker/Cura 2023-11-29 13:47:07 +01:00
Casper Lamboo
35b298d338
Merge pull request #16090 from ThatGuyZim/master
Anycubic Kobra 2 Printer Definition
2023-11-29 13:46:34 +01:00
Jaime van Kessel
dff3f1a406
Remove redundant overrides
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-11-29 13:46:32 +01:00
Casper Lamboo
280b002799
Merge branch 'main' into master 2023-11-29 13:45:52 +01:00
Jaime van Kessel
d6c16b8ac7
Merge branch 'main' of github.com:Ultimaker/Cura into PP-363_Fix_broken_definitions 2023-11-29 13:45:36 +01:00
Jaime van Kessel
2be8113859
Merge branch 'fix_oneatatime_modifiermeshes' of github.com:fieldOfView/Cura 2023-11-29 13:30:03 +01:00
Jaime van Kessel
7dcbaadb62
Merge branch 'creality-ender-3-V3-SE-print-head' of github.com:mcuprojects/Cura 2023-11-29 13:25:49 +01:00
Jaime van Kessel
26012cc9e3
Update slicing crash template 2023-11-29 13:15:36 +01:00
Jaime van Kessel
be2c30b38f
Merge branch 'main' of github.com:Ultimaker/Cura 2023-11-29 13:14:20 +01:00
Jaime van Kessel
d54d7745c1
Merge pull request #16806 from StephenFluin/patch-1
chore: update SlicingCrash.yaml with latest 5.4.0 release
2023-11-29 13:14:09 +01:00
Jaime van Kessel
74205392f0
Merge pull request #16107 from Asterchades/main
Update sovol_base_planetary.def.json
2023-11-29 13:12:46 +01:00
Jaime van Kessel
4d38ca9852
Merge branch 'main' of github.com:Asterchades/Cura 2023-11-29 13:11:39 +01:00
Jaime van Kessel
022139ecb3
Merge branch 'main' of github.com:Ultimaker/Cura 2023-11-29 13:10:05 +01:00
Jaime van Kessel
ce075c598c
Merge pull request #16996 from goofoo3d/main
add Renkforce 10+ and Multicomp MCPI 200 profiles
2023-11-29 13:08:45 +01:00
Jaime van Kessel
d25b0d941b
Merge branch 'main' of github.com:goofoo3d/Cura 2023-11-29 13:05:29 +01:00
nallath
1a9e82da86 Applied printer-linter format 2023-11-29 12:04:33 +00:00
Jaime van Kessel
18c1dbb79d
Merge branch 'main' of github.com:Barrnet/Cura 2023-11-29 13:00:28 +01:00