Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add utility to extend enums #888

Merged

Conversation

casperlamboo
Copy link
Contributor

CURA-10720

CURA-10676
@casperlamboo casperlamboo force-pushed the CURA-10720_handle_enum_extensions branch from 14dc613 to 7c80d92 Compare July 24, 2023 19:27
UM/Settings/SettingDefinition.py Outdated Show resolved Hide resolved
UM/Settings/SettingDefinition.py Outdated Show resolved Hide resolved
CURA-10720

Co-authored-by: Jaime van Kessel <[email protected]>
@github-actions
Copy link

github-actions bot commented Jul 25, 2023

Unit Test Results

2 404 tests  ±0   2 389 ✔️ ±0   28s ⏱️ -3s
       1 suites ±0        15 💤 ±0 
       1 files   ±0          0 ±0 

Results for commit bcf8a24. ± Comparison against base commit 49ba701.

♻️ This comment has been updated with latest results.

casperlamboo and others added 2 commits July 25, 2023 14:46
…tensions

# Conflicts:
#	resources/i18n/cs_CZ/uranium.po
#	resources/i18n/de_DE/uranium.po
#	resources/i18n/es_ES/uranium.po
#	resources/i18n/fi_FI/uranium.po
#	resources/i18n/fr_FR/uranium.po
#	resources/i18n/hu_HU/uranium.po
#	resources/i18n/it_IT/uranium.po
#	resources/i18n/ja_JP/uranium.po
#	resources/i18n/ko_KR/uranium.po
#	resources/i18n/nl_NL/uranium.po
#	resources/i18n/pl_PL/uranium.po
#	resources/i18n/pt_BR/uranium.po
#	resources/i18n/pt_PT/uranium.po
#	resources/i18n/ru_RU/uranium.po
#	resources/i18n/tr_TR/uranium.po
#	resources/i18n/uranium.pot
#	resources/i18n/zh_CN/uranium.po
#	resources/i18n/zh_TW/uranium.po
@casperlamboo casperlamboo changed the base branch from main to CURA-10475_engineplugin July 26, 2023 12:30
@jellespijker jellespijker merged commit 6a8c6c0 into CURA-10475_engineplugin Jul 26, 2023
9 checks passed
@jellespijker jellespijker deleted the CURA-10720_handle_enum_extensions branch July 26, 2023 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants