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

7628 Commits

Author SHA1 Message Date
Remco Burema
bd1fdeda88
Merge branch 'main' into CURA-11166-importing-model-translations 2023-12-13 09:49:50 +01:00
c.lamboo
f5085ef205 Merge remote-tracking branch 'origin/main' 2023-12-12 17:19:47 +01:00
c.lamboo
3472ec26a1 Fix snapshot for makerbot 
CURA-11442
 2023-12-12 17:19:28 +01:00
Saumya Jain
75ff829b5f
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-12-11 10:25:04 +01:00
Jelle Spijker
065f22ba07
Merge branch 'main' into CURA-10831 2023-12-08 07:45:00 +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
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
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
b46f6e8e09 Add support for CLI file opening with 'cura' and 'slicer' schemes 
CURA-11288
 2023-12-05 18:24:44 +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
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
Erwan MATHIEU
3c86bf140c Add support for OAuth2 client secret 2023-12-04 19:48:20 +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
7a4d26452a
Fix testing against literal instead of value 
Contribute to CURA-10831
 2023-12-04 14:00:42 +01:00
Saumya Jain
28f55e05fa
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-12-04 10:52:42 +01:00
c.lamboo
cf6874c984 Use the HttpRequestManager to avoid blocking the main thread 
CURA-11289
 2023-12-01 10:53:30 +01:00
c.lamboo
a442228f38 Open file on url scheme 
CURA-11289
 2023-11-30 22:45:18 +01:00
c.lamboo
ad871c627e Don't open file on open file event 
CURA-11288
 2023-11-30 13:42:48 +01:00
c.lamboo
87caa0307a Display message on open file event 
CURA-11288
 2023-11-30 13:28:33 +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
Jaime van Kessel
2be8113859
Merge branch 'fix_oneatatime_modifiermeshes' of github.com:fieldOfView/Cura 2023-11-29 13:30:03 +01:00
Casper Lamboo
c1bd5e2356
Merge branch 'main' into remove-luts 2023-11-29 12:30:15 +01:00
c.lamboo
cf27163934 Update bot to reference 2023-11-29 12:25:51 +01:00
c.lamboo
19eaf89fcd Merge branch '5.6' 
# Conflicts:
#	conanfile.py
 2023-11-28 15:25:37 +01:00
c.lamboo
6cca534304 Fix previous commit 
CURA-11394
 2023-11-28 10:34:08 +01:00
c.lamboo
02655cde2e Add tool tip + icon + description for solid intent 
CURA-11394
 2023-11-28 10:07:16 +01:00
c.lamboo
a9dcfaa032 specify bot id type 2023-11-27 15:32:55 +01:00
c.lamboo
495079f3d9 Clean up bot LUT 
We had a lot of Look up Tables scattered around in the cura repository. This can be solved by adding a `bot_id` entry to metadata of the various makerbot extruders/materials/definitions
 2023-11-24 16:49:31 +01:00
Jelle Spijker
efafe1503d
Merge branch '5.6' 
# Conflicts:
#	conanfile.py
#	resources/definitions/ultimaker_methodx.def.json
#	resources/definitions/ultimaker_methodxl.def.json
 2023-11-15 13:53:39 +01:00
Jaime van Kessel
fc3d150b39
Merge branch 'CURA-11299' of github.com:Ultimaker/Cura into 5.6 2023-11-15 13:11:36 +01:00
Erwan MATHIEU
19089b84a3 Upgrade SDK version 2023-11-14 17:36:24 +01:00
c.lamboo
2569c4c3d1 Use flip up/down to reverse list 
CURA-11293
 2023-11-10 18:42:10 +01:00
c.lamboo
2be72ca22b Revert "Use intersection instead of convex hull intersection" 
This reverts commit 4982680dfce39bb189c0a3a4b1c7bb41480123a0.
 2023-11-10 18:00:00 +01:00
c.lamboo
61b33691e5 Fix nozzle selection checkmark 
CURA-11299
 2023-11-10 15:21:18 +01:00
Erwan MATHIEU
4982680dfc Use intersection instead of convex hull intersection 
CURA-11293
 2023-11-09 16:22:52 +01:00
Erwan MATHIEU
b8e8f2ac0e Code readability improvement 
CURA-11293
 2023-11-09 16:19:35 +01:00
Erwan MATHIEU
6539841f3e Fix possibly wrong disallowed area display 
CURA-11293
 2023-11-09 14:23:46 +01:00
saumya.jain
457cecba59 using numpy for array calculation 
CURA-7647
 2023-11-08 13:29:47 +05:30
saumya.jain
6301926885 Calculating time of travel for each line segment 
CURA-7647
 2023-11-07 18:08:08 +05:30
Erwan MATHIEU
39db261b4b Integrate prime tower mode setting 2023-11-03 13:13:27 +01:00