aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/Colours
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.Client/Common/Colours
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
Diffstat (limited to 'Minecraft.Client/Common/Colours')
-rw-r--r--Minecraft.Client/Common/Colours/ColourTable.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp
index dc58cfb1..5c74d5ec 100644
--- a/Minecraft.Client/Common/Colours/ColourTable.cpp
+++ b/Minecraft.Client/Common/Colours/ColourTable.cpp
@@ -201,6 +201,10 @@ wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
L"Effect_Hunger",
L"Effect_Weakness",
L"Effect_Poison",
+ L"Effect_Wither",
+ L"Effect_HealthBoost",
+ L"Effect_Absorption",
+ L"Effect_Saturation",
L"Potion_BaseColour",
@@ -246,6 +250,12 @@ wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
L"Mob_Ocelot_Colour2",
L"Mob_Villager_Colour1",
L"Mob_Villager_Colour2",
+ L"Mob_Bat_Colour1",
+ L"Mob_Bat_Colour2",
+ L"Mob_Witch_Colour1",
+ L"Mob_Witch_Colour2",
+ L"Mob_Horse_Colour1",
+ L"Mob_Horse_Colour2",
L"Armour_Default_Leather_Colour",
L"Under_Water_Clear_Colour",
@@ -262,6 +272,11 @@ wchar_t *ColourTable::ColourTableElements[eMinecraftColour_COUNT] =
L"Sign_Text",
L"Map_Text",
+
+ L"Leash_Light_Colour",
+ L"Leash_Dark_Colour",
+
+ L"Fire_Overlay",
L"HTMLColor_0",
L"HTMLColor_1",