Commit graph

33321 commits

Author SHA1 Message Date
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
Jelle Spijker
39e505371e
fix option naming
should be `enable_i18n`

Contributes to CURA-10831
2023-11-12 11:08:09 +01:00
Jelle Spijker
1216674728
Modernize conanfile.py
This commit updates the Uranium dependency in the Conan file and introduces an internationalization (i18n) option.
It refactor the devtool checks to check for the "enable_i18n" option instead.
Lastly, cleanups and adjustments are done in preparation for enabling i18n in the build process.

Contributes to CURA-10831
2023-11-12 11:00:21 +01:00
Jelle Spijker
1fb1fe9faa
don't set release from conandata.yml
Contributes to CURA-10831
2023-11-11 11:59:56 +01:00
Jelle Spijker
33ecec6951
add release tagging info to conandata
Contributes to CURA-10831
2023-11-11 10:42:05 +01:00
Jelle Spijker
220054cbb5
Use cura-workflows to determine version
Contributes to CURA-10831
2023-11-11 08:59:53 +01:00
Jelle Spijker
2dfe6d7e5d
Set requirements and version with conandata
This will allow workflow automations to easily create release branches and set the versions

Contributes to CURA-10831
2023-11-11 08:54:23 +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
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
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