Merge branch 'main' into upstream-merge

# Conflicts:
#	Minecraft.Client/Windows64Media/strings.h
#	Minecraft.World/BiomeSource.cpp
#	Minecraft.World/BiomeSource.h
This commit is contained in:
George V.
2026-04-13 22:26:43 +03:00
63 changed files with 1283 additions and 821 deletions

View File

@@ -1915,6 +1915,7 @@ void UIScene_LoadMenu::handleGainFocus(bool navBack)
{
m_checkboxOnline.setChecked(m_MoreOptionsParams.bOnlineGame == TRUE);
}
SetFocusToElement(eControl_GameMode);
}
#ifdef __ORBIS__