GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 14:59:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,550 Commits 295 Branches 268 Tags
Commit Graph

33550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jelle Spijker
4656873e9d
Set working versions to 5.6.0-beta.2 
Contributes to CURA-11269
 2023-11-15 13:46:04 +01:00
Jelle Spijker
b66b032e45
Revert "Pin release versions to 5.6.0-beta.1" 
This reverts commit 2ec70cb6b7837d30560bcb74e2942bbb9ed0c5f1.
 2023-11-15 13:45:25 +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
Jelle Spijker
2ec70cb6b7
Pin release versions to 5.6.0-beta.1 
Contributes to CURA-11269
5.6.0-beta.1 		2023-11-15 11:11:56 +01:00
Remco Burema
a7490274d2 Tiny improvement to 5.6 changelog text. 
part of CURA-11258
 2023-11-15 10:43:20 +01:00
Jelle Spijker
ea92211634
Merge pull request #17316 from Ultimaker/CURA_realease_sdk-version-upgrade 
SDK version upgrade
 2023-11-15 10:30:06 +01:00
Erwan MATHIEU
19089b84a3 Upgrade SDK version 2023-11-14 17:36:24 +01:00
Jaime van Kessel
02bcd9f857
Merge pull request #17283 from dudecc/patch-1 
Copy version info to miracle_config
 2023-11-14 17:00:12 +01:00
Remco Burema
90de8e571d
Merge pull request #17301 from Ultimaker/CURA-11099-start-time-duration 
Add extruder start/end gcode duration settings
 2023-11-14 15:55:29 +01:00
Casper Lamboo
2c1f0fc58f
Apply suggestions from code review 
Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com>
 2023-11-14 14:42:44 +01:00
Paul Kuiper
c15e52399c - Removed step correction from z shrinkage compensation for the Method X 
- Changed step size tfrom 0.2mm to 0.203mm for Method X
- Added material compensations for ABS-R and ABS-CF
- New resolve formula in fdmprinter.def.json to not use the shrinkage factors of support materials
 2023-11-14 14:32:42 +01:00
Casper Lamboo
e2c6955a8e
Merge pull request #17241 from Ultimaker/CURA-11166-3mf-file-saving-center-allign 
Center alligning in case of 3mf write
 2023-11-14 10:58:18 +01:00
Remco Burema
0a302d202a
Translations 5.6: Update Dutch to be consistent. 
... with a daft decision that was made in the past.

part of CURA-11300

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2023-11-14 08:48:35 +01:00
Casper Lamboo
a96a9d78c2
Merge pull request #17302 from Ultimaker/CURA-11316-Increase-build-volume-size-Method-machines 
Increase build volume size method machines
 2023-11-13 13:43:09 +01:00
pkuiper-ultimaker
003633547a Applied printer-linter format 2023-11-13 10:13:57 +00:00
Paul Kuiper
3b13e644e0
Update ultimaker_method_base.def.json 2023-11-13 11:12:15 +01:00
Paul Kuiper
478648df8d Increase the build volume of the Method machines such that they match CloudPrint. 
CURA-11316
 2023-11-13 10:58:14 +01:00
casperlamboo
d56b77db37 Applied printer-linter format 2023-11-13 09:49:14 +00:00
c.lamboo
c4573ba855 Add extruder start/end gcode duration settings 
CURA-11099
 2023-11-13 10:46:44 +01:00
Casper Lamboo
2215b452b8
Merge pull request #17279 from Ultimaker/PP-387_Pillowing_PETG_AA08 
Increase bridging flowrate on AA 0.8 at 0.2 layers
 2023-11-13 09:59:32 +01:00
Chris Moore
c61c896619
Copy version info to miracle_config 
Only fields in miracle_config get sent to analytics by method firmware.  I don't know if anything else in our codebase expects to also see these fields at the top level, so I put one copy at the top level and one copy down in miracle_config.
 2023-11-10 14:13:58 -05:00
c.lamboo
fa9986bece Merge branch '5.6' into CURA-11300_translations_v5p6 2023-11-10 19:01:03 +01:00
Casper Lamboo
ecbf89df1c Add enable_i18n install option to packaging 
This should fix translations
 2023-11-10 19:00:28 +01:00
Casper Lamboo
5d337453b2
Merge pull request #17272 from Ultimaker/CURA-11293_fix_disallowed_areas 
[CURA-11293] fix disallowed areas
 2023-11-10 18:53:34 +01:00
casperlamboo
0196334c81 Applied printer-linter format 2023-11-10 17:43:23 +00:00
c.lamboo
2569c4c3d1 Use flip up/down to reverse list 
CURA-11293
 2023-11-10 18:42:10 +01:00
c.lamboo
c9730a2089 Revert "Revert "Increase print volume for method printers"" 
This reverts commit 70f77dde2924855e792de74b7e51a84ef94e68c7.

# Conflicts:
#	resources/definitions/ultimaker_method_base.def.json
#	resources/definitions/ultimaker_methodx.def.json
#	resources/definitions/ultimaker_methodxl.def.json
 2023-11-10 18:41:45 +01:00
c.lamboo
2be72ca22b Revert "Use intersection instead of convex hull intersection" 
This reverts commit 4982680dfce39bb189c0a3a4b1c7bb41480123a0.
 2023-11-10 18:00:00 +01:00
c.lamboo
ff81fb6ca0 force commit 2023-11-10 15:35:54 +01:00
c.lamboo
61b33691e5 Fix nozzle selection checkmark 
CURA-11299
 2023-11-10 15:21:18 +01:00
Casper Lamboo
5504cc1b60
Add enable_i18n install option to packaging 
This should fix translations
 2023-11-10 14:29:16 +01:00
Frederic Meeuwissen
5f69c89309 Increase bridging flowrate on AA 0.8 at 0.2 layers 2023-11-10 14:24:44 +01:00
Erwan MATHIEU
4982680dfc Use intersection instead of convex hull intersection 
CURA-11293
 2023-11-09 16:22:52 +01:00
Erwan MATHIEU
b8e8f2ac0e Code readability improvement 
CURA-11293
 2023-11-09 16:19:35 +01:00
Erwan MATHIEU
6539841f3e Fix possibly wrong disallowed area display 
CURA-11293
 2023-11-09 14:23:46 +01:00
Jelle Spijker
f26891320b
Merge pull request #17041 from Ultimaker/CURA-11078_python_312_spike 
Fix '\d' deprecation warning.
 2023-11-09 12:32:52 +01:00
Jelle Spijker
052c37ae6f
Merge branch 'main' into CURA-11078_python_312_spike 2023-11-09 12:29:25 +01:00
Remco Burema
49a7ea5b48 Officially supported languages' translations for v5.6.x 
Due to various circumstances, an excel spreadsheet, the .tsv export thereof, and a temporary, thrown together python script where involved this time. Please double-check thoroughly.

CURA-11300
 2023-11-08 16:05:54 +01:00
Remco Burema
b8deb31eb9 Merge branch '5.6' 2023-11-07 15:17:32 +01:00
Jaime van Kessel
0c78cdbdbd
Merge branch '5.6' of github.com:Ultimaker/Cura into 5.6 2023-11-07 12:47:11 +01:00