GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-31 15:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,644 Commits 295 Branches 268 Tags
Commit Graph

33644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Jelle Spijker
75089401c6
Merge branch 'main' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-05 07:20:10 +01:00
Jelle Spijker
b8d41abdee
Add FIXME reminder 
Contributes to CURA-10831
 2023-12-05 07:18:57 +01:00
Jelle Spijker
1334b65bdf
Post the unit test result on PR's 
Contributes to CURA-10831
 2023-12-05 07:17:21 +01:00
Jelle Spijker
f5354c058f
Add FIXME reminders 
Contributes to CURA-10831
 2023-12-05 07:08:36 +01:00
Jelle Spijker
86493b9c4d
Use VirtualPythonEnv generator 
Contributes to CURA-10831
 2023-12-05 06:05:21 +01:00
Jelle Spijker
e688a3a9df
use relative location of pytest 
Somehow pytest can't be found on the PATH

Contributes to CURA-10831
 2023-12-05 05:51:48 +01:00
Jelle Spijker
3dcf208d73
Revert "only run on main/release and PR's" 
This reverts commit 6140d5ad145fb29a39f1ed0f7bb3f5e6468d1256.
 2023-12-05 05:31:51 +01:00
Jelle Spijker
a2eb1dc085
Activate all activate_github_action envs 
Contributes to CURA-10831
 2023-12-05 05:30:57 +01:00
Jelle Spijker
6140d5ad14
only run on main/release and PR's 
Contributes to CURA-10831
 2023-12-05 05:06:40 +01:00
Jelle Spijker
a69e4f1678
set needs for testing job 
Contributes to CURA-10831
 2023-12-05 05:05:12 +01:00
Jelle Spijker
ad96082a16
Port unit-test to cura-workflows 
Contributes to CURA-10831
 2023-12-05 05:03:59 +01:00