Jelle Spijker
319d478a9a
Merge pull request #17422 from Ultimaker/remove-luts
...
Clean up bot LUT
2023-11-29 15:09:09 +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
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
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
4d38ca9852
Merge branch 'main' of github.com:Asterchades/Cura
2023-11-29 13:11:39 +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
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
c.lamboo
19eaf89fcd
Merge branch '5.6'
...
# Conflicts:
# conanfile.py
2023-11-28 15:25:37 +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
Jelle Spijker
56d1fff1bc
Merge branch '5.6'
2023-11-28 08:26:32 +01:00
Jelle Spijker
7e0b979198
Merge branch '5.6' into fix_french_translations
2023-11-28 08:16:40 +01:00
c.lamboo
efe43325ae
Fix intent display in darkmode
2023-11-27 17:21:20 +01:00
MariMakes
8da1c6b40c
Updated changelog from Stable
...
Update changelog to reflect changes
2023-11-27 17:00:08 +01:00
Erwan MATHIEU
4e73e6230e
Fixed wrong French translations
2023-11-27 15:40:23 +01:00
c.lamboo
a9dcfaa032
specify bot id type
2023-11-27 15:32:55 +01:00
Jaime van Kessel
344d648445
Merge branch '5.6' of github.com:Ultimaker/Cura
2023-11-27 12:40:56 +01:00
Casper Lamboo
dfbc27b2c5
Merge pull request #17388 from Ultimaker/PP-402-no-support-in-raft-when-self-support-is-used
...
No support material in raft when self support is used
2023-11-24 21:40:49 +01:00
Remco Burema
9698210083
Fix more printer-linter warnings.
...
done as part of CURA-11379
2023-11-24 17:03:20 +01:00
Remco Burema
e7de8597c1
Fix printer-linter warnings.
...
done as part of CURA-11379
2023-11-24 16:56:26 +01:00
casperlamboo
ae047d2f8c
Applied printer-linter format
2023-11-24 15:50:31 +00:00
c.lamboo
495079f3d9
Clean up bot LUT
...
We had a lot of Look up Tables scattered around in the cura repository. This can be solved by adding a `bot_id` entry to metadata of the various makerbot extruders/materials/definitions
2023-11-24 16:49:31 +01:00
Remco Burema
2d04650c61
Fixed prime-tower for machines with explicit disallowed areas.
...
These machines have disallowed areas (either 'machine_disallowed_areas' or 'nozzle_dissalowed_areas'), which can't at the moment be calculated with formula's (not without adding a feature at least, but we're currently in feature-freeze).
part of CURA-11379
2023-11-24 16:41:44 +01:00
Remco Burema
6107a49627
Take nozzle-offset into account.
...
Nozzle offsets can inflience the disallowed areas, so they should be taken into account for the prime-tower position.
part of CURA-11379
2023-11-24 15:32:24 +01:00
Jelle Spijker
b6ceeee7a0
Merge gradual_flow_settings in fdm_printer.def.json
...
Contribute to CURA-11300
2023-11-24 14:43:44 +01:00
Jelle Spijker
7daba59836
Extract and generate i18n po(t) files for bundled plugin
...
Contribute to CURA-11300
2023-11-24 13:45:53 +01:00
c.lamboo
4ce092837e
Merge branch '5.6'
...
# Conflicts:
# conanfile.py
2023-11-24 10:24:52 +01:00
Cláudio 'Patola' Sampaio
712b06871f
Added pt_BR strings for Cura 5.6
2023-11-22 17:29:53 +01:00
Paul Kuiper
83c2626884
When self-support is enabled do not use support material layers in the raft.
...
Note: Switching support settings takes longer in the UI due to the recalculations.
PP-402
2023-11-21 09:37:54 +01:00
HellAholic
bca778bca0
Revert "When self-support is enabled do not use support material layers in the raft."
...
This reverts commit d4966044ea19000ac67bd29738e1754b2dfaeb25.
2023-11-21 09:26:52 +01:00
Paul Kuiper
d4966044ea
When self-support is enabled do not use support material layers in the raft.
...
Note: Switching support settings takes longer in the UI due to the recalculations.
PP-402
2023-11-21 09:24:34 +01:00
c.lamboo
17393ce101
Manually adding gradual flow settings
...
CURA-11300
2023-11-17 15:36:39 +01:00
Casper Lamboo
9144c1d178
Merge pull request #17264 from Ultimaker/CURA-11300_translations_v5p6
...
[CURA-11300] Officially supported languages' translations for v5.6.x
2023-11-17 10:33:10 +01:00
Casper Lamboo
08f46fcff0
Merge pull request #17315 from Ultimaker/PP-399-Shrinkage-compensation-Method-materials
...
Shrinkage compensation method materials
2023-11-16 12:48:52 +01:00
Paul Kuiper
c089248625
- ABS-R print profiles for ABS-R with the 1C extruder
2023-11-16 09:12:24 +01:00
Remco Burema
278206d456
Merge remote-tracking branch 'origin/5.6' into CURA-11300_translations_v5p6
2023-11-15 14:40:32 +01:00
Remco Burema
2019060cbd
Hopefully last missing translations for 5.6
...
part of CURA-11300
2023-11-15 14:39:40 +01:00
Jelle Spijker
efafe1503d
Merge branch '5.6'
...
# Conflicts:
# conanfile.py
# resources/definitions/ultimaker_methodx.def.json
# resources/definitions/ultimaker_methodxl.def.json
2023-11-15 13:53:39 +01:00
Remco Burema
1c3fb2a79b
Generated additional 5.6 i18n strings.
...
part of CURA-11300
2023-11-15 13:29:56 +01:00
Jaime van Kessel
fc3d150b39
Merge branch 'CURA-11299' of github.com:Ultimaker/Cura into 5.6
2023-11-15 13:11:36 +01:00
Remco Burema
a7490274d2
Tiny improvement to 5.6 changelog text.
...
part of CURA-11258
2023-11-15 10:43:20 +01:00
Erwan MATHIEU
19089b84a3
Upgrade SDK version
2023-11-14 17:36:24 +01:00
