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
0e2a592b26
Merge branch 'main' into CURA-11288
2023-11-28 15:26:04 +01:00
c.lamboo
19eaf89fcd
Merge branch '5.6'
...
# Conflicts:
# conanfile.py
2023-11-28 15:25:37 +01:00
c.lamboo
1f9e0e2dee
Add url protocol support for msi, nsis, dmg and pkg installers
...
CURA-11288
2023-11-28 15:15:39 +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
Jelle Spijker
a8d1c8b639
Add new JFrog remote
...
Contribute to CURA-10831
2023-11-28 08:16:08 +01:00
Jelle Spijker
c2b40bb562
Add missing quote marks
...
Contribute to CURA-10831
2023-11-28 07:48:17 +01:00
Jelle Spijker
d74edde1d7
Add the new Cura JFrog remote
...
Upload to both remotes during the overlapping time
Contribute to CURA-10831
2023-11-28 07:01:03 +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
Jelle Spijker
e1110dd412
Update workflow to be on par with other repo's
...
Contribute to CURA-10831
2023-11-27 16:23:13 +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
d5574f36c0
Merge branch 'CURA-11377' of github.com:Ultimaker/Cura
2023-11-27 14:44:56 +01:00
c.lamboo
0225f92ae0
Fix local cloud printing for um printers
...
CURA-11390
2023-11-27 13:47:08 +01:00
Jaime van Kessel
344d648445
Merge branch '5.6' of github.com:Ultimaker/Cura
2023-11-27 12:40:56 +01:00
Jelle Spijker
9693ec2e0e
Merge main and update versions
...
Contribute to CURA-10831
2023-11-27 08:10:34 +01:00
Jelle Spijker
1f6edc42c9
Merge branch 'main' into CURA-10831
...
# Conflicts:
# conanfile.py
2023-11-27 08:03:07 +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
Casper Lamboo
3a7dc07dc1
Merge pull request #17421 from Ultimaker/CURA-11379_fix_primetower_pos
...
[CURA-11379] Fix Prime-Tower position for printers with explicit disallowed areas.
2023-11-24 21:35:15 +01:00
GregValiant
7c809f5f43
Update DisplayInfoOnLCD.py
...
Added M73 options. Verbiage changes.
2023-11-24 15:19:07 -05: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
Casper Lamboo
b3d9b22ec0
Add labs extruder to lookuptable
2023-11-24 16:08:45 +01:00
c.lamboo
e66a3cda67
Only extend file formats for um3
...
This was a mistake in the previous implementation. The relevant piece of code was adding ufp support for um3 printers. This is legacy support for this printer since the printer didn't know it supported ufp, but through the digital factory it could support ufp files. However, with the addition of method printers we should have added an additional check where we also check if the printer is an um3. Instead an additional check was added that did the same for makerbot printers. Because of this check didn't have a "is method" check support for makerbot format is also added to s-line printers and legacy um printers.
(fyi @saumyaj3)
CURA-11377
2023-11-24 15:40:11 +01:00
c.lamboo
31976e591f
All method printers are cloud connected
...
CURA-11377
2023-11-24 15:35:31 +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
Erwan MATHIEU
3bf84c8838
Terminology and descriptions refinement
2023-11-24 14:32:56 +01:00
Remco Burema
4f0840d7b5
Merge pull request #15866 from GregValiant/DisplayInfoOnLCD
...
Display Info on LCD
2023-11-24 14:00:06 +01:00
Remco Burema
ad9b11a256
Merge branch 'main' into DisplayInfoOnLCD
2023-11-24 13:59:45 +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
Jelle Spijker
3811e37c73
Use updated translation tools
...
These also take bundled plugin settings into account
Contribute to CURA-11300
2023-11-24 12:59:46 +01:00
c.lamboo
4ce092837e
Merge branch '5.6'
...
# Conflicts:
# conanfile.py
2023-11-24 10:24:52 +01:00
Jelle Spijker
b7c1022ed1
Use conf to get Cura version
2023-11-24 10:20:46 +01:00
