GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-03 10:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,378 Commits 295 Branches 267 Tags
Commit Graph

34378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jelle Spijker
1d8918f30d
Use conf to get i18n options 
This will give us more finegrained control
if we want the pot files extracted
or build the mo files

Contributes to CURA-11300
 2023-11-24 10:18:23 +01:00
Remco Burema
670f86d218
Merge pull request #17416 from Ultimaker/CURA-11300_translations_v5p6 
PT_BR translations 5.6.x
 2023-11-24 09:48:41 +01:00
Remco Burema
0cabfbf86c
Merge pull request #17402 from Patola/5.6 
Added pt_BR strings for Cura 5.6
 2023-11-23 09:09:56 +01:00
Cláudio 'Patola' Sampaio
712b06871f Added pt_BR strings for Cura 5.6 2023-11-22 17:29:53 +01:00
Jaime van Kessel
60bf2fbc2c
Add preference to disable sentry engine crash reporting 
CURA-11364
 2023-11-21 14:01:58 +01:00
Jelle Spijker
f22d82c1e0
Use CURA-11634 for CuraEngine 
Contributes to CURA-11364
 2023-11-21 13:27:26 +01:00
Jelle Spijker
3bd2ea4296
Pin dulcificum version 
Contributes to CURA-11364
 2023-11-21 13:22:18 +01:00
Jelle Spijker
3052c6be3b
Enable Sentry for the engine if the conan con sentry_url is set 
If you want to test this locally do a conan install with:

```
-c user.curaengine:sentry_url=<sentry_url>
```

The URL is stored in the CuraEngine repository variables

Contributes to CURA-11364
 2023-11-21 13:21:25 +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
Remco Burema
fd5a7bb416
Merge pull request #17338 from Ultimaker/CURA-11347 
Cura 11347
 2023-11-21 07:41:33 +01:00
c.lamboo
17393ce101 Manually adding gradual flow settings 
CURA-11300
 2023-11-17 15:36:39 +01:00
Casper Lamboo
afe3f54167
Remove debug statements 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2023-11-17 11:00:50 +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
c.lamboo
36f2deea1d Fix some more parsing issues 
Example of issues we had is that parsing floating point numbers would parse the dot as an attribute syntax and trying to retrieve both sides of the attributes to the get_value resolve. E.g `3.14` would be interpreted as getting the `14` property of the object `3`, which ofcourse throws an error.

CURA-11347
 2023-11-16 14:45:46 +01:00
c.lamboo
036516b8f9 Re-add support for post slice data variables in start/end gcode 
With previous implementation we lost support for these variables in start/end gcode
"filament_cost", "print_time", "filament_amount", "filament_weight", "jobname"

CURA-11347
 2023-11-16 13:53:43 +01:00
Jelle Spijker
01998d2113
Simplify conan-package.yml workflow 
Removed redundant workflow dispatch inputs and comments in .github/workflows/conan-package.yml. These were unnecessary
for the push-based workflow and have been simplified to streamline the process and make it more efficient.

Contributes to CURA-10831
 2023-11-16 13:35:13 +01:00
Jelle Spijker
78cafeca4b
Only check internal requirements when building internal 
Contributes to CURA-10831
 2023-11-16 13:30:26 +01:00
Jelle Spijker
96f6aac79b
Create the Cura binaries 
Contributes to CURA-10831
 2023-11-16 13:25:21 +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
c.lamboo
1950cc65aa Pin dulcificum at beta.1 release 5.6.0-beta.2 2023-11-16 11:13:14 +01:00
Casper Lamboo
549158e088
Merge pull request #17336 from Ultimaker/PP-400-enable-ABS-R-support-for-1C-extruder 
- ABS-R print profiles for ABS-R with the 1C extruder
 2023-11-16 10:26:30 +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
a7d4ba0528
use testing for fdm_material and curaengine 
Contributes to CURA-11269
 2023-11-15 13:54: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