Saumya Jain
5c2e6a0294
Merge branch '5.5' into Profile_update_post_5.5_beta
2023-10-16 17:10:33 +02:00
Erwan MATHIEU
700196954a
Restored missing translation labels
...
CURA-10994
2023-10-16 17:01:44 +02:00
Paul Kuiper
9a3c92c2af
- Added PETG visual mode for 0.15mm
2023-10-16 14:26:53 +02:00
saumya.jain
8ca005f804
Updated upgrade script. removed update of materials other than:
...
abs
pla
petg and
tough-pla
CURA-11151
2023-10-16 14:13:12 +02:00
Jaime van Kessel
5f998f0ab4
Merge branch 'main' of github.com:Ultimaker/Cura
2023-10-16 12:07:38 +02:00
Jaime van Kessel
9c38514824
Merge branch '5.5' of github.com:Ultimaker/Cura
2023-10-16 12:07:30 +02:00
Jaime van Kessel
dc66732150
Revert "Fix certain 3mf models not restoring properly"
...
This reverts commit 7e38927a8c
.
2023-10-16 12:07:17 +02:00
Saumya Jain
5a8b7e5740
Merge pull request #16962 from Ultimaker/CURA-11155-formulas-in-start-end-code
...
Formulas in start/end code
2023-10-16 11:25:34 +02:00
Paul Kuiper
e87560ef0f
- Added PETG visual mode for 0.1mm and 0.06mm
...
- Improved bridging settings for PETG AA0.8
- Improved unretract settings fro PETG and ABS AA0.8
2023-10-16 11:19:05 +02:00
Saumya Jain
15b75b7327
Merge branch 'main' into CURA-11155-formulas-in-start-end-code
2023-10-16 10:58:58 +02:00
Jaime van Kessel
7e38927a8c
Fix certain 3mf models not restoring properly
...
CURA-11164
2023-10-16 10:56:57 +02:00
Jaime van Kessel
67c11bf7f8
Fix certain 3mf models not restoring properly
...
CURA-11164
2023-10-16 10:56:07 +02:00
Erwan MATHIEU
7ad35fae44
Merge pull request #16758 from Pelochus/main
...
Fix spanish translation for lightning infill
2023-10-16 10:19:54 +02:00
Erwan MATHIEU
cfea094161
Restore missing translation
...
Lost during conflicts solve
2023-10-16 10:15:34 +02:00
Erwan MATHIEU
9d40c840cf
Merge branch 'main' into main
2023-10-16 10:09:19 +02:00
goofoo
8332a4226c
add renkforce 10+ 0.2 nozzle profile
2023-10-16 10:03:41 +08:00
goofoo
723f9bc53f
add renkforce 10+ profiles
2023-10-16 09:37:57 +08:00
Casper Lamboo
673303a238
Merge pull request #16976 from Ultimaker/CURA_9755-Meshes-in-correct-location
...
Cura 9755 meshes in correct location
2023-10-13 15:09:25 +02:00
Erwan MATHIEU
0190fc099a
Merge branch 'main' into CURA-10783_prime_tower_with_raft
2023-10-13 14:53:24 +02:00
Erwan MATHIEU
acb0406e8e
Better handling of prime tower base with raft
...
CURA-10783
2023-10-13 14:40:49 +02:00
Erwan MATHIEU
a91032f62e
Fixed prime tower placement warning issue
...
CURA-10783
2023-10-13 11:37:50 +02:00
saumya.jain
7880cb5bde
remove debug statement
...
CURA-9755
2023-10-13 11:29:44 +02:00
Erwan MATHIEU
b5bebdbbb1
Fine-tune prime tower base settings
...
CURA-10783
2023-10-13 09:29:05 +02:00
saumya.jain
277d48bd51
3mf Meshes load in correct location
...
CURA-9755
2023-10-13 09:27:57 +02:00
Erwan MATHIEU
0a2ee541e3
Include prime tower base size into footprint
...
CURA-10783
2023-10-13 09:14:41 +02:00
Erwan MATHIEU
1d8de818ed
Remove dependancy to prime tower brim
...
CURA-10783
2023-10-13 07:47:22 +02:00
c.lamboo
e98240fb2c
Cleanup code in GcodeStartEndFormatter
...
CURA-11155
2023-10-13 07:36:45 +02:00
Fernando Pietchaki
93f2171146
Merge branch 'main' into object-reload-refactor
2023-10-12 23:41:49 -03:00
Jelle Spijker
c223b39752
Fixed macos runner id
...
https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
2023-10-13 00:51:50 +02:00
c.lamboo
14afd73c19
Make sure default variables are available in start/end code
...
The following properties are not settings-names, but could previously be used as template variables
- material_id
- time
- date
- day
- initial_extruder_nr
- material_id
- material_name
- material_type
- material_brand
- time
- date
- day
- initial_extruder_nr
These properties are _awkwardly_ propogated through the kwargs of the `get_value` method of `GcodeStartEndFormatter`. I don't quite like implementing it like this, but to avoid API breaks I couldn't change abusing the kwargs arg for this purpose.
CURA-11155
2023-10-12 21:09:10 +02:00
c.lamboo
c3f3a86385
Extend start/end gcode templates feature with support for formula's
...
CURA-11155
2023-10-12 16:53:39 +02:00
GregValiant
c40dad5119
Update DisplayInfoOnLCD.py
...
Added Print Finish Time option. Changed a couple of if statements to "line.startswith".
2023-10-11 19:47:57 -04:00
c.lamboo
4378e8a827
use macos 12 when building all installers
...
This should fix the nightly builds
2023-10-11 16:50:10 +02:00
Jaime van Kessel
9f1be535eb
Merge branch '5.5' of github.com:Ultimaker/Cura
2023-10-11 15:36:16 +02:00
Jaime van Kessel
6f82397476
Merge pull request #16943 from Ultimaker/CURA-11146_badonka_donk_donk
...
CURA-11146 limit the bloat in the new AppImage
2023-10-11 15:35:48 +02:00
Jelle Spijker
d8ef4c381c
Less bloat
...
Could also be a solution for:
- #16932
- #16935
Fixes CURA-11146
Fixes #16931
2023-10-11 14:21:24 +02:00
saumyaj3
e627a4174f
Applied printer-linter format
2023-10-11 12:18:41 +00:00
Saumya Jain
7d9d6cbf6a
Merge pull request #16796 from dim1triy/add-creality-ender-3-V3-SE
...
Add Creality Ender 3 V3 SE definition and nozzles
2023-10-11 14:17:27 +02:00
Saumya Jain
e7fc100f62
Merge branch 'main' into add-creality-ender-3-V3-SE
2023-10-11 14:00:33 +02:00
Casper Lamboo
b81e1b8741
Merge pull request #16829 from Ultimaker/CURA-10994_translations_v5p5
...
[CURA-10994] Translations for 5.5.x
2023-10-11 10:33:50 +02:00
Jelle Spijker
73900d33a2
Merge branch '5.5'
...
# Conflicts:
# conanfile.py
2023-10-10 12:24:18 +02:00
Jelle Spijker
57b581d19b
Revert "Revert "loosen versions to latest stable""
...
This reverts commit e2578554e6
.
2023-10-10 12:23:18 +02:00
c.lamboo
e9cc6532d7
re-add ColorDialog class
...
to avoid api breaks
2023-10-10 12:00:55 +02:00
c.lamboo
4eb0ba9861
re-add functions for arrange
...
To avoid api break
new functions are added with the depricated decorator
2023-10-10 11:39:06 +02:00
Jelle Spijker
e2578554e6
Revert "loosen versions to latest stable"
...
This reverts commit 8d34bcdeb5
.
2023-10-10 11:18:40 +02:00
Remco Burema
c20b227e5f
Prevent 'major' API/SDK version break.
2023-10-10 11:15:57 +02:00
Jelle Spijker
8d34bcdeb5
loosen versions to latest stable
2023-10-10 11:03:02 +02:00
Jelle Spijker
0f770aca15
set version to 5.6.0-alpha
2023-10-10 11:00:49 +02:00
Jelle Spijker
72bba90e73
Pin versions
2023-10-10 10:53:38 +02:00
c.lamboo
d48a50be81
Merge branch '5.5'
2023-10-10 10:39:11 +02:00