GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 01:46:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,188 Commits 295 Branches 268 Tags
Commit Graph

7744 Commits

Author SHA1 Message Date
HellAholic
1a57f12172 change label to name to align with items in global_container_stack check 2024-01-16 10:01:26 +01:00
saumya.jain
d0560ae790 restoring qmlregistersingletons in Cura 
adding wrapper for deprecation warning

CURA-7812
 2024-01-10 17:54:02 +01:00
Erwan MATHIEU
f00636d374 Merge remote-tracking branch 'origin/main' into optimized-prime-tower 2024-01-10 16:30:34 +01:00
Erwan MATHIEU
330dfd8be0 Add retry to OAuth token refresh failure 
CURA-11406
 2024-01-10 15:13:42 +01:00
Erwan MATHIEU
a5e158de9e
Merge branch 'main' into improve_oauth 2024-01-10 08:45:17 +01:00
saumya.jain
676099ccf6 Removed singleton UM.OperationStack, merged with CuraActions 
Removed ActiveTool singleton added to controller singleton

CURA-7812
 2024-01-09 10:29:45 +01:00
saumya.jain
d01b5c1767 Renmoved singleton Um.Application 
CURA-7812
 2024-01-08 17:46:04 +01:00
saumya.jain
11aa71a5df Singleton management in Cura 
-QualityManagementModel, MaterialManagementModel, SimpleModeSettingsManager, MachineActionManager and CustomQualityProfilesDropDownMenuModel *deleted*
-QualityProfilesDropDownmenuModel changed to RegisterType

CURA-7812
 2024-01-08 14:41:41 +01:00
alexandr-vladimirov
2b05a370ca Allow to set print sequence manually 2024-01-04 06:30:23 +03:00
Saumya Jain
13540c3ed2
Merge branch 'main' into CURA-7647-proof-of-concept 2023-12-22 10:04:54 +01:00
Saumya Jain
a9a26859e7
Merge branch 'main' into CURA-7647-proof-of-concept 2023-12-21 17:30:48 +01:00
saumya.jain
a309c9efdb Error is displayed on Cura screen 
CURA-11289
 2023-12-21 17:26:11 +01:00
saumya.jain
608c2344c5 on_error takes multiple args 
CURA-11289
 2023-12-21 16:25:12 +01:00
Erwan MATHIEU
01d0a2d9ce
Merge branch 'Ultimaker:main' into improve_oauth 2023-12-19 20:23:59 +01:00
Saumya Jain
581d1bf3b9
Merge branch 'main' into CURA-11288 2023-12-19 10:17:15 +01:00
saumya.jain
cfec5e0cc1 Proof of concept for simulation 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>

CURA-7647
 2023-12-19 10:12:56 +01:00
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