vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into upstream-merge

Browse Source 
# 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
parent ed201b95c5 f307d7b0eb
commit ac7a207597
63 changed files with 1283 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/App_enums.h
+4
View File
@@ -452,6 +452,10 @@ enum eMinecraftColour
eMinecraftColour_Mob_Rabbit_Colour2,
eMinecraftColour_Mob_Endermite_Colour1,
eMinecraftColour_Mob_Endermite_Colour2,
eMinecraftColour_Mob_Guardian_Colour1,
eMinecraftColour_Mob_Guardian_Colour2,
eMinecraftColour_Mob_ElderGuardian_Colour1,
eMinecraftColour_Mob_ElderGuardian_Colour2,
eMinecraftColour_Armour_Default_Leather_Colour,
Minecraft.Client/Common/Colours/ColourTable.cpp
+4
View File
@@ -267,6 +267,10 @@ const wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
L"Mob_Rabbit_Colour2",
L"Mob_Endermite_Colour1",
L"Mob_Endermite_Colour2",
L"Mob_Guardian_Colour1",
L"Mob_Guardian_Colour2",
L"Mob_ElderGuardian_Colour1",
L"Mob_ElderGuardian_Colour2",
Minecraft.Client/Common/Media/MediaWindows64.arc
BIN
View File
Binary file not shown.
Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ void IUIScene_AbstractContainerMenu::handleEnchantButton(int slot, int iPad) {
eMinecraftColour colCost = costEnough ? eHTMLColor_7 : eHTMLColor_c;
std::wstring message = costEnough
? std::to_wstring(menu->costs[slot]) + L" Enchantment Levels"
? std::to_wstring(slot + 1) + (slot == 0 ? L" Enchantment Level" : L" Enchantment Levels")
: L"Level Requirement: " + std::to_wstring(menu->costs[slot]);
vector<HtmlString>* lines = new vector<HtmlString>();
Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
+1
View File
@@ -1915,6 +1915,7 @@ void UIScene_LoadMenu::handleGainFocus(bool navBack)
{
m_checkboxOnline.setChecked(m_MoreOptionsParams.bOnlineGame == TRUE);
}
SetFocusToElement(eControl_GameMode);
}
#ifdef __ORBIS__
Minecraft.Client/Common/res/TitleUpdate/res/colours.col
BIN
View File
Binary file not shown.
Minecraft.Client/Common/res/TitleUpdate/res/colours.xml
+4
View File
@@ -285,6 +285,10 @@ if __name__=="__main__": notecolors()
<colour name="Mob_Rabbit_Colour2" value="734831"/>
<colour name="Mob_Endermite_Colour1" value="161616"/>
<colour name="Mob_Endermite_Colour2" value="6E6E6E"/>
<colour name="Mob_Guardian_Colour1" value="5A8272"/>
<colour name="Mob_Guardian_Colour2" value="F17D30"/>
<colour name="Mob_ElderGuardian_Colour1" value="CECCBA"/>
<colour name="Mob_ElderGuardian_Colour2" value="747693"/>
<colour name="Armour_Default_Leather_Colour" value="A06540"/>