Erwan MATHIEU
01d0a2d9ce
Merge branch 'Ultimaker:main' into improve_oauth
2023-12-19 20:23:59 +01:00
saumya.jain
cb01026aad
Path correction for cura application for msi
...
CURA-11288
2023-12-19 15:27:53 +01:00
Saumya Jain
6709cc8b3e
Merge branch 'main' into PP-408-improve-raft-quality
2023-12-19 15:03:59 +01:00
saumya.jain
69f8227b41
Path correction for cura application for msi
...
CURA-11288
2023-12-19 14:33:21 +01:00
saumya.jain
5769fcba50
Deleting the register key for url scheme
...
CURA-11288
2023-12-19 13:26:19 +01:00
saumya.jain
ddfd7d6a06
Use of APP_ASSOCIATE in url_scheme
...
CURA-11288
2023-12-19 10:50:56 +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
Saumya Jain
3c550557b9
Merge pull request #17687 from Ultimaker/CURA-11482_additional_sentry_info
...
CURA-11482 additional sentry info
2023-12-18 17:15:02 +01:00
saumya.jain
82a3308d26
for merging to main
...
CURA-11482
2023-12-18 17:03:52 +01:00
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
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
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
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
