GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-15 00:48:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,855 Commits 290 Branches 260 Tags
Commit Graph

33855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
9bb065a294
make sure fdm_materials is installed for internals 
Contributes to CURA-10831
 2023-12-08 07:40:30 +01:00
Jelle Spijker
f94198c108
Fix behaviour of internal property 
The attribute 'enterprise' in conanfile.py was incorrectly named and has been renamed to 'internal'.
This revision ensures that options are accessed correctly to avoid potential issues in usage.

Contributes to CURA-10831
 2023-12-07 14:41:44 +01:00
Saumya Jain
88d7d65622
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-12-07 12:59:08 +01:00
Casper Lamboo
7574b56eba
Update conanfile.py 2023-12-07 10:32:01 +01:00
Casper Lamboo
31073b93d8
Merge branch 'main' into CURA-11288 2023-12-07 10:31:23 +01:00
c.lamboo
84d56367f4 Also listen to the "/" appended string for url schemes 
Windows adds a slash for some reason

CURA-11288
 2023-12-06 13:33:57 +01:00
Saumya Jain
54f93ca72f
Merge branch 'main' into CURA-11166-importing-model-translations 2023-12-06 12:41:28 +01:00
saumya.jain
30e4c61620 review comments fix 
CURA-11166
 2023-12-06 12:39:10 +01:00
Casper Lamboo
c4a88a33a7
Merge pull request #17527 from Ultimaker/CURA-11279_fix_arrange_grid 
[CURA-11279] Fix arrange in grid
 2023-12-06 12:18:32 +01:00
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 920809f064d39f2426312428a02c7db0b3c4410d.
 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
c.lamboo
568fc4ca76 Revert "Fix opening files on windows" 
This reverts commit d6a73a5976067078c7e7e63e2d6a12b89573d566.
 2023-12-06 08:49:37 +01:00
c.lamboo
d6a73a5976 Fix opening files on windows 
`_open_url_queue` is expecting a list of strings, not a `QUrl` instance

CURA-11288
 2023-12-06 07:57:45 +01:00
c.lamboo
153e2e7bd0 Fix warning/Boyscouting 
CURA-11288
 2023-12-06 07:14:36 +01:00
c.lamboo
c4939701e1 Re-enable genrate cura version 
CURA-11288
 2023-12-06 06:37:36 +01:00
c.lamboo
351183f407 Temporarily pin spdlog 
CURA-11288
 2023-12-06 06:13:39 +01:00
c.lamboo
a7a4e4bd29 Revert "Update nsi installer" 
This reverts commit 4b4b8b351462f7b788816c2ddbf2d75d38ee7de6.
 2023-12-06 06:06:08 +01:00
c.lamboo
b46f6e8e09 Add support for CLI file opening with 'cura' and 'slicer' schemes 
CURA-11288
 2023-12-05 18:24:44 +01:00
Paul Kuiper
a9c3c2b4b4 Increased raft base layer speed from 5mm/s to 10mm/s and increased raft middle layer linewidth from 0.4 to 0.7mm to increase productivity. 
PP-408
 2023-12-05 15:25:52 +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
1156ad7f56
Merge branch 'main' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-05 10:24:50 +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
Jelle Spijker
704f128004
Use CURA-10831 working packages for deps 
Contributes to CURA-10831
 2023-12-05 10:15:51 +01:00
Jelle Spijker
8aa6d2c5b6
Update conan_data with actual version 
Contributes to CURA-10831
 2023-12-05 07:44:04 +01:00
Jelle Spijker
75089401c6
Merge branch 'main' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-05 07:20:10 +01:00
Jelle Spijker
b8d41abdee
Add FIXME reminder 
Contributes to CURA-10831
 2023-12-05 07:18:57 +01:00
Jelle Spijker
1334b65bdf
Post the unit test result on PR's 
Contributes to CURA-10831
 2023-12-05 07:17:21 +01:00
Jelle Spijker
f5354c058f
Add FIXME reminders 
Contributes to CURA-10831
 2023-12-05 07:08:36 +01:00
Jelle Spijker
86493b9c4d
Use VirtualPythonEnv generator 
Contributes to CURA-10831
 2023-12-05 06:05:21 +01:00
Jelle Spijker
e688a3a9df
use relative location of pytest 
Somehow pytest can't be found on the PATH

Contributes to CURA-10831
 2023-12-05 05:51:48 +01:00
Jelle Spijker
3dcf208d73
Revert "only run on main/release and PR's" 
This reverts commit 6140d5ad145fb29a39f1ed0f7bb3f5e6468d1256.
 2023-12-05 05:31:51 +01:00
Jelle Spijker
a2eb1dc085
Activate all activate_github_action envs 
Contributes to CURA-10831
 2023-12-05 05:30:57 +01:00
Jelle Spijker
6140d5ad14
only run on main/release and PR's 
Contributes to CURA-10831
 2023-12-05 05:06:40 +01:00
Jelle Spijker
a69e4f1678
set needs for testing job 
Contributes to CURA-10831
 2023-12-05 05:05:12 +01:00
Jelle Spijker
ad96082a16
Port unit-test to cura-workflows 
Contributes to CURA-10831
 2023-12-05 05:03:59 +01:00
Erwan MATHIEU
b794989468 Allow for OAuth service to stop after token has been retrieved 2023-12-04 20:58:11 +01:00
Erwan MATHIEU
aac9af577b Fix AuthorizationService signals 2023-12-04 20:09:36 +01:00
Jelle Spijker
260a73e14c
Use older name for OS specific installer workflows 
Contributes to CURA-10831
 2023-12-04 19:51:11 +01:00
Erwan MATHIEU
3c86bf140c Add support for OAuth2 client secret 2023-12-04 19:48:20 +01:00
Jelle Spijker
b678951759
Applied work-around for GH true/false instead of True/False 
Contributes to CURA-10831
 2023-12-04 18:15:50 +01:00
Jelle Spijker
9ad993f8ca
Reinstate OS specific installer workflows 
For those that wants to build a OS specific installer

Contributes to CURA-10831
 2023-12-04 18:06:20 +01:00
Jelle Spijker
040f85c956
Remove redundant export workflow 
Contributes to CURA-10831
 2023-12-04 17:36:32 +01:00
saumya.jain
ce0cdd0b91 Model translations while changing build plates 
while importing models, coordinate translations shouldn’t matter and the object should be organized on the plate where it finds space.

CURA-11166
 2023-12-04 17:07:43 +01:00
Jelle Spijker
20ab319ec0
Use default values from cura-workflows 
Contributes to CURA-10831
 2023-12-04 16:31:50 +01:00
Jelle Spijker
e904123b80
Use Uranium CURA-11137 
Contribute to CURA-11137
 2023-12-04 14:41:46 +01:00
Jelle Spijker
832b3ea7e5
Merge branch 'CURA-10831' into CURA-11137_update_pyqt6 
# Conflicts:
#	conanfile.py
 2023-12-04 14:38:04 +01:00
Jelle Spijker
7a4d26452a
Fix testing against literal instead of value 
Contribute to CURA-10831
 2023-12-04 14:00:42 +01:00