3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
33317 commits 313 branches 275 tags 718 MiB
Commit graph

33317 commits

This branch
This branch
All branches
Author SHA1 Message Date
Remco Burema
1c3fb2a79b Generated additional 5.6 i18n strings. 
part of CURA-11300
 2023-11-15 13:29:56 +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
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 70f77dde29.

# 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 4982680dfc.
 2023-11-10 18:00:00 +01:00
c.lamboo
ff81fb6ca0 force commit 2023-11-10 15:35:54 +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
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
Jaime van Kessel
0c78cdbdbd
Merge branch '5.6' of github.com:Ultimaker/Cura into 5.6 2023-11-07 12:47:11 +01:00
Jaime van Kessel
f3760fc1f6
Disable material sync support for method printers 
No idea why it was turned on, but these machines don't support that at all

CURA-11285
 2023-11-07 12:46:24 +01:00
c.lamboo
cba4151ffc Also add balanced to intent names 
CURA-11221
 2023-11-07 10:57:45 +01:00
saumya.jain
9b9f6b1bc3 intent name translated from intent_translations 
CURA-11221
 2023-11-07 10:55:09 +01:00
saumya.jain
b5c47ae8f3 Intent type translated while reading 3mf 
CURA-11221
 2023-11-07 10:54:59 +01:00
c.lamboo
22abbb82b5 Remove mm unit from bool type 2023-11-07 10:22:17 +01:00
casperlamboo
f4d1db8961 Applied printer-linter format 2023-11-06 16:25:27 +00:00
c.lamboo
70f77dde29 Revert "Increase print volume for method printers" 
This reverts commit a111b39e
 2023-11-06 17:24:08 +01:00
Jaime van Kessel
23a81426f8
Merge pull request #17243 from Ultimaker/CURA-11258_Changelog_for_56 
Update grammar
 2023-11-06 16:47:18 +01:00
MariMakes
f4bdda5e5b Update grammar 
Changed Its to Their
 2023-11-06 15:53:47 +01:00
wawanbreton
845338d43b Applied printer-linter format 2023-11-06 13:41:43 +00:00
Erwan MATHIEU
b1ae649584 Merge remote-tracking branch 'origin/5.6' into CURA-11260_methodx_small_buildplate 2023-11-06 14:40:22 +01:00
Erwan MATHIEU
a111b39ee4 Increase print volume for method printers 
CURA-11260
 2023-11-06 14:40:05 +01:00
Casper Lamboo
670ba6088e
Merge pull request #17205 from Ultimaker/CURA-11262-Update-products-to-id.json 
Update products_to_id.json to include the Method machines
 2023-11-06 14:39:21 +01:00
c.lamboo
4230f1f8b7 Merge branch '5.6' into CURA-11262-Update-products-to-id.json 2023-11-06 14:35:36 +01:00
Casper Lamboo
6c481bb54e
Merge pull request #17240 from Ultimaker/CURA-11277_rename_LABS_extruder 
[CURA-11277] Rename Method Lab extruder to LABS
 2023-11-06 14:13:27 +01:00
Casper Lamboo
cc86f6ad4d
Merge pull request #17194 from Ultimaker/PP-387_Pillowing_PETG_AA08 
Set bridging flow to 200 for PETG AA08 02
 2023-11-06 13:45:59 +01:00
Erwan MATHIEU
26f472c0a2 Rename Method Lab extruder to LABS 
CURA-11277
 2023-11-06 12:07:09 +01:00
Paul Kuiper
55f8ef9791
Apply suggestions from code review 
Change Makerbot to UltiMaker

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2023-11-06 11:31:41 +01:00
Remco Burema
35d1ae3272 Fix 'brand alignment' messing up actual print files. 2023-11-03 17:04:26 +01:00
Paul Kuiper
d6d73ed6e6 - Bug fix: ensure the product names in the material files match the Makerbot Method machine definition id 2023-11-03 16:23:49 +01:00
Erwan MATHIEU
ad868434f3
Merge pull request #17186 from Ultimaker/CURA-11263-about-dialog-blemishes 
about dialog blemishes
 2023-11-03 15:13:29 +01:00
c.lamboo
51ab740905 Simplify conan install 
CURA-11263
 2023-11-03 14:53:33 +01:00
Erwan MATHIEU
e52b580988
Merge pull request #17201 from Ultimaker/CURA-11266- 
Grey out menu if no items are present
 2023-11-03 14:44:30 +01:00
Erwan MATHIEU
a96ec7663b Fix build script syntax error 2023-11-03 14:12:11 +01:00
Casper Lamboo
a25b482842
Merge pull request #17200 from Ultimaker/Update_Method 
Update method profiles
 2023-11-03 13:33:13 +01:00
Casper Lamboo
34ee25aa4c
Merge branch '5.6' into Update_Method 2023-11-03 13:32:18 +01:00
Casper Lamboo
e16127caba
Merge pull request #17195 from Ultimaker/CURA-11267-Update_MakerBot_B 
CURA-11267 Update the Naming of the Method printers
 2023-11-03 13:31:06 +01:00
Paul Kuiper
f9dcb89d3e - Bug fix: raft_air_gap -> raft_airgap 
- Larger prime tower foot (6->10mm)
- RapidRinse: disable fan and small area temperature = print temeprature
 2023-11-03 13:19:12 +01:00
Jaime van Kessel
1e42438973
Merge pull request #17198 from Ultimaker/CURA-11258_Changelog_for_56 
Updated Changelog for 5.6
 2023-11-03 12:04:46 +01:00
MariMakes
a02aa1068b Updated Changelog for 5.6 
New and improved changelog
 2023-11-03 11:48:52 +01:00
c.lamboo
a225ee56fd Resolve QML warning 
CURA-11263
 2023-11-03 11:45:25 +01:00
Erwan MATHIEU
b2291064fb Re-fix nightly builds 2023-11-03 11:30:11 +01:00
Casper Lamboo
572099fffa
Merge pull request #17196 from Ultimaker/CURA-11259_improve_prime_tower_settings_desc 
[CURA-11259] Improve prime tower settings description
 2023-11-03 11:28:49 +01:00
Erwan MATHIEU
97ad526ea4 Refine prime tower new settings descriptions 
CURA-11259
 2023-11-03 10:56:59 +01:00
MariMakes
d8e6a2b0b4 Align S-line printers 
This should be in line with the updated brand guide.
 2023-11-03 10:54:28 +01:00