GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,378 Commits 294 Branches 267 Tags
Commit Graph

34378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
5744371f38 Add anonymous user tracking to slice message 
User tracking has been added to the 'slice_message' method in the 'StartSliceJob.py' file. A unique, anonymous UUID is generated for each user, stripping away identifiable data with a bitmask operation. The user's Cura version is also included in the message. This facilitates more robust analysis of crash reports and user behaviors.

Contributes to CURA-11482
 2023-12-17 17:44:30 +01:00
Jelle Spijker
a6218c3f54
Use cura sentry id and version 
Contribute to CURA-11482
 2023-12-15 18:08:46 +01:00
Saumya Jain
afcf3e1e09
Merge branch 'main' into PP-408-improve-raft-quality 2023-12-15 16:13:45 +01:00
c.lamboo
a071795f9e Fix monitor page 
CURA-11426
 2023-12-15 12:43:54 +01:00
Jelle Spijker
64cb060bd1
Revert "Update Sentry to 1.39.1" 
This reverts commit aebd5f32c5bb82a39d9d2f7a6ab070761e8e7e28.
 2023-12-15 10:38:33 +01:00
Remco Burema
6085596917
Merge pull request #17611 from Ultimaker/CURA-11443_sentry 
Cura 11443 sentry
 2023-12-15 10:28:20 +01:00
Jelle Spijker
139c46fc9d
Use generic job name 2023-12-15 10:23:42 +01:00
Remco Burema
cbd318410e
Merge branch 'main' into CURA-11443_sentry 2023-12-15 10:23:06 +01:00
Jelle Spijker
aebd5f32c5
Update Sentry to 1.39.1 
Contributes to CURA-11464
 2023-12-15 10:08:16 +01:00
Remco Burema
2f08727ade
Merge pull request #17616 from Ultimaker/CURA-11392_threshold 
CURA-11392_threshold
 2023-12-14 13:10:18 +01:00
Miro Hrončok
1941fbe90b
Avoid "KeyError: material_name" crash in Fedora 
Traceback (most recent call last):
      File "/usr/lib/python3.11/site-packages/UM/Qt/ListModel.py", line 54, in data
        return self._items[index.row()][self._role_names[role].decode("utf-8")]
               ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    KeyError: 'material_name'

Downstream report: https://bugzilla.redhat.com/show_bug.cgi?id=2252195
Community: https://community.ultimaker.com/topic/44538-cura-53-crashs-at-startup/

For reasons unknown, this crash does not happen with the AppImage.

Nevertheless, in 2baada8a70b15dd87948a25855e17d15b0ece58c
material_name was added as a role, not material_label.
Reaming the field in the sentinel extruder makes the crash go away.
 2023-12-14 12:52:26 +01:00
Remco Burema
841ba2d16a
Merge pull request #17641 from Ultimaker/CURA-11137_update_pyqt6 
[CURA-11137] Update to PyQt 6.6.0
 2023-12-14 12:14:04 +01:00
Dmitry Gribenchuk
aff37dae3f
fix comment space 2023-12-14 11:00:06 +02:00
Dmitry Gribenchuk
8116df6c21
cleanup unused import and fix comment space 2023-12-13 20:10:28 +02:00
Jelle Spijker
5125c7d33a
Don't package system managed openssl 
This should fall back on the Conan package ssl version which is in the root of the AppDir

Contributes to CURA-11080
 2023-12-13 17:00:12 +01:00
Remco Burema
0aa7e74fe5 Merge remote-tracking branch 'origin/main' into CURA-11137_update_pyqt6 2023-12-13 10:56:01 +01:00
Remco Burema
bd1c2af3e4
Merge pull request #17518 from Ultimaker/CURA-11166-importing-model-translations 
Model translations while changing build plates
 2023-12-13 10:09:46 +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
Casper Lamboo
933927b145
Merge pull request #17250 from Ultimaker/CURA-7647-play-simulation-time-dependent 
Cura 7647 play simulation time dependent
 2023-12-12 17:16:58 +01:00
saumya.jain
84565b7daa removal of magic number 
CURA-7647
 2023-12-12 16:53:34 +01:00
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