Commit graph

33541 commits

Author SHA1 Message Date
jellespijker
bffbded591 Override spdlog version 2023-12-01 17:42:27 +01:00
c.lamboo
29193d833c Revert "enable_sentry in install commands"
This reverts commit 2f452c6581.
2023-11-30 11:01:51 +01:00
c.lamboo
a87ad75edc Merge remote-tracking branch 'origin/main' 2023-11-30 10:02:01 +01:00
c.lamboo
2f452c6581 enable_sentry in install commands 2023-11-30 10:01:20 +01:00
Jelle Spijker
ff19142fdf
Don't try to copy non existing openssl
Contributes to CURA-10831
2023-11-30 07:16:15 +01:00
Jelle Spijker
b65cd0181f Disable shared openssl for Windows
Temp fix

Contributes to CURA-10561
2023-11-29 22:14:18 +01:00
Jelle Spijker
ac55306d0b
Use Dulcificum 0.1.0-beta.1 2023-11-29 18:44:11 +01:00
Jelle Spijker
1a945fe066
Update linux.yml 2023-11-29 17:04:58 +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
Jelle Spijker
6b3d7d0f2c
Update conan-package.yml 2023-11-29 13:57:06 +01:00
nallath
8b0e914abb Applied printer-linter format 2023-11-29 12:49:59 +00:00
Jaime van Kessel
3165b54624
Fix typo 2023-11-29 13:49:02 +01:00
Jaime van Kessel
6d6989c95c
Merge branch 'PP-363_Fix_broken_definitions' of github.com:Ultimaker/Cura 2023-11-29 13:47:07 +01:00
Casper Lamboo
35b298d338
Merge pull request #16090 from ThatGuyZim/master
Anycubic Kobra 2 Printer Definition
2023-11-29 13:46:34 +01:00
Jaime van Kessel
dff3f1a406
Remove redundant overrides
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-11-29 13:46:32 +01:00
Casper Lamboo
280b002799
Merge branch 'main' into master 2023-11-29 13:45:52 +01:00
Jaime van Kessel
d6c16b8ac7
Merge branch 'main' of github.com:Ultimaker/Cura into PP-363_Fix_broken_definitions 2023-11-29 13:45:36 +01:00
Jaime van Kessel
2be8113859
Merge branch 'fix_oneatatime_modifiermeshes' of github.com:fieldOfView/Cura 2023-11-29 13:30:03 +01:00
Jaime van Kessel
7dcbaadb62
Merge branch 'creality-ender-3-V3-SE-print-head' of github.com:mcuprojects/Cura 2023-11-29 13:25:49 +01:00
Jaime van Kessel
26012cc9e3
Update slicing crash template 2023-11-29 13:15:36 +01:00
Jaime van Kessel
be2c30b38f
Merge branch 'main' of github.com:Ultimaker/Cura 2023-11-29 13:14:20 +01:00
Jaime van Kessel
d54d7745c1
Merge pull request #16806 from StephenFluin/patch-1
chore: update SlicingCrash.yaml with latest 5.4.0 release
2023-11-29 13:14:09 +01:00
Jaime van Kessel
74205392f0
Merge pull request #16107 from Asterchades/main
Update sovol_base_planetary.def.json
2023-11-29 13:12:46 +01:00
Jaime van Kessel
4d38ca9852
Merge branch 'main' of github.com:Asterchades/Cura 2023-11-29 13:11:39 +01:00
Jaime van Kessel
022139ecb3
Merge branch 'main' of github.com:Ultimaker/Cura 2023-11-29 13:10:05 +01:00
Jaime van Kessel
ce075c598c
Merge pull request #16996 from goofoo3d/main
add Renkforce 10+ and Multicomp MCPI 200 profiles
2023-11-29 13:08:45 +01:00
Jaime van Kessel
d25b0d941b
Merge branch 'main' of github.com:goofoo3d/Cura 2023-11-29 13:05:29 +01:00
nallath
1a9e82da86 Applied printer-linter format 2023-11-29 12:04:33 +00:00
Jaime van Kessel
18c1dbb79d
Merge branch 'main' of github.com:Barrnet/Cura 2023-11-29 13:00:28 +01:00
Jaime van Kessel
1cbddef5f6
Merge pull request #17462 from Jeredian/documentation_update_readme
Documentation: update readme
2023-11-29 12:57:29 +01:00
Casper Lamboo
c1bd5e2356
Merge branch 'main' into remove-luts 2023-11-29 12:30:15 +01:00
casperlamboo
7e0d633106 Applied printer-linter format 2023-11-29 11:26:50 +00:00
c.lamboo
cf27163934 Update bot to reference 2023-11-29 12:25:51 +01:00
Jelle Spijker
015f41145d
Also run on 0 versions
Contributes to CURA-10831
2023-11-28 17:32:23 +01:00
Jelle Spijker
50fe469122
Use CCI gettext
Contributes to CURA-10831
2023-11-28 17:30:15 +01:00
Remco Burema
0d6b19eba6
Merge pull request #17424 from GregValiant/DisplayInfoOnLCD
Display info on lcd
2023-11-28 16:41:20 +01:00
GregValiant
d251d4c042 Update DisplayInfoOnLCD.py
Added M73 options.  Verbiage changes.
2023-11-28 16:38:52 +01:00
Jelle Spijker
17cc36a96d
Switch to cura jfrog
Contributes to CURA-10831
2023-11-28 16:19:46 +01:00
c.lamboo
19eaf89fcd Merge branch '5.6'
# Conflicts:
#	conanfile.py
2023-11-28 15:25:37 +01:00
Pavel Polyakov
2280b7c5a6 docs(readme): fix Test and Conan badges 2023-11-28 21:51:33 +08:00
Pavel Polyakov
6f335e4ed3 docs(readme): update Downloads badge 2023-11-28 21:51:33 +08:00
Jelle Spijker
28d44f6fe0
Esnure that the installers are aware of the new JFrog artifactory 2023-11-28 13:28:05 +01:00
Jelle Spijker
5b6e9d1005
Pin the release versions
Contributes to CURA-11385
2023-11-28 11:57:11 +01:00
Casper Lamboo
b341f9e3cf
Merge pull request #17450 from Ultimaker/CURA-11391_Changelog_5.6_Stable
Updated changelog to Stable
2023-11-28 10:38:08 +01:00
Mariska
3e725448d9
Apply suggestions from code review
Based on codereview

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2023-11-28 10:36:45 +01:00
c.lamboo
6cca534304 Fix previous commit
CURA-11394
2023-11-28 10:34:08 +01:00
c.lamboo
02655cde2e Add tool tip + icon + description for solid intent
CURA-11394
2023-11-28 10:07:16 +01:00
Jelle Spijker
56d1fff1bc
Merge branch '5.6' 2023-11-28 08:26:32 +01:00
Jelle Spijker
bc0942a338
Merge pull request #17449 from Ultimaker/fix_french_translations
Fixed wrong French translations
2023-11-28 08:22:39 +01:00
Jelle Spijker
7e0b979198
Merge branch '5.6' into fix_french_translations 2023-11-28 08:16:40 +01:00