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

34356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
saumya.jain
a9aba2df74 maintenence. 
CURA-7647
 2023-12-12 16:06:22 +01:00
saumya.jain
3c0b9a65db removing commented code 
CURA-7647
 2023-12-12 14:59:41 +01:00
saumya.jain
189a22aa4f refactoring of code for easier access and avoid hanging issues 
CURA-7647
 2023-12-12 14:56:06 +01:00
Jelle Spijker
51a6e414a7
Merge branch 'main' into CURA-11137_update_pyqt6 
# Conflicts:
#	conandata.yml
 2023-12-12 14:02:36 +01:00
saumya.jain
cc4627886b Name shortned for Cura settings 
CURA-11392
 2023-12-12 13:01:37 +01:00
Jelle Spijker
ba0fb97d63
Include threshold settings 
Contributes to CURA-11391
 2023-12-12 10:01:59 +01:00
Saumya Jain
a19c667106
Update plugins/SimulationView/SimulationViewProxy.py 
simplified code

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2023-12-11 14:29:33 +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
ab480a29ce Use CuraEngine CURA-11443 
Contribute to CURA-11443
 2023-12-11 09:16:59 +01:00
Jelle Spijker
3da4fb2d26 Install pdb files 
Contribute to CURA-11443
 2023-12-11 09:13:36 +01:00
Christopher Peredy
94f14b53f8 EN4 add Neptune 4 Plus and Max variants v2.0 2023-12-09 16:58:24 +01:00
Christopher Peredy
16715e6a3b EN4 update Neptune 4 (Pro) definition 
Update same acceleration and start G-code settings according to
Elegoo Cura v4.8.0_20231208.
 2023-12-09 16:55:36 +01:00
Jelle Spijker
d9b75cedef
point to testing 
Contributes to CURA-10831
 2023-12-08 15:07:41 +01:00
Jelle Spijker
47f3e01d30
Merge pull request #17475 from Ultimaker/CURA-10831 
Cura 10831
 2023-12-08 14:36:51 +01:00
Jelle Spijker
f2f2f742bd
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2023-12-08 14:36:29 +01:00
Saumya Jain
031370acf9
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-12-08 11:48:53 +01:00
saumya.jain
7711c15dde removed unnecessary import 
CURA-7647
 2023-12-08 11:43:38 +01:00
saumya.jain
bf2c8b5a08 Simulation time fed to the timer controlling speed 
simulation time is made 10x faster than the actual time, for better visualisation

CURA-7647
 2023-12-08 11:41:16 +01:00
Remco Burema
bcb26f7647
Merge pull request #17556 from Ultimaker/CURA-11441-Cooling-from-zero-to-one 
CURA-11441 Fix fan speed Method machines
 2023-12-08 11:00:07 +01:00
Paul Kuiper
df6239be89 Fix a bug in which Cura sets fanspeed in the 0..255 range instead of the 0..1 range for Method machines. 
CURA-11441
 2023-12-08 10:52:00 +01:00
Remco Burema
f8239aa1fa Add 'Enterprise' if applicable to About-dialog. 
done as a 15 min fix
 2023-12-08 10:29:59 +01:00
Jelle Spijker
065f22ba07
Merge branch 'main' into CURA-10831 2023-12-08 07:45:00 +01:00
Jelle Spijker
e6812a31d8
No need to create a conan-package 
Contributes to CURA-10831
 2023-12-08 07:42:06 +01:00
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