34356 Commits

Author SHA1 Message Date
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
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
Saumya Jain
f58500ddb1
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-11-08 13:33:09 +05:30
saumya.jain
457cecba59 using numpy for array calculation
CURA-7647
2023-11-08 13:29:47 +05:30
Remco Burema
b8deb31eb9 Merge branch '5.6' 2023-11-07 15:17:32 +01:00
saumya.jain
efda0aaba4 updated for every layer
CURA-7647
2023-11-07 18:42:41 +05:30
saumya.jain
6301926885 Calculating time of travel for each line segment
CURA-7647
2023-11-07 18:08:08 +05:30
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
Saumya Jain
6a86a987bc
Merge branch '5.6' into CURA-11166-3mf-file-saving-center-allign 2023-11-06 19:14:48 +05:30
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
saumya.jain
cdb2a5789d Center alligning in case of 3mf write
Also reverting commit 7e38927a8cb76d3789fde21482aeff1e254cc636

CURA-11166
2023-11-06 16:33:32 +05:30
Erwan MATHIEU
f873a94ef8
Merge pull request #17202 from Ultimaker/CURA-11260-
Align print volume with buildplate for method x and method xl
2023-11-06 11:32:45 +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