diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-04 03:56:03 -0600 |
| commit | 42aec6dac53dffa6afe072560a7e1d4986112538 (patch) | |
| tree | 0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data | |
| parent | c9d58eeac7c72f0b3038e084667b4d89a6249fce (diff) | |
| parent | ef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff) | |
Merge branch 'main' into pr/win64-world-saves
# Conflicts:
# Minecraft.Client/MinecraftServer.cpp
# README.md
Diffstat (limited to 'Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data')
| -rw-r--r-- | Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/TexturePack.xzp | bin | 3590769 -> 4186611 bytes |
| -rw-r--r-- | Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/x16Data.pck | bin | 869992 -> 922699 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/TexturePack.xzp b/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/TexturePack.xzp Binary files differindex f2e865fc..2eae0020 100644 --- a/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/TexturePack.xzp +++ b/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/TexturePack.xzp diff --git a/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/x16Data.pck b/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/x16Data.pck Binary files differindex 50d5d4ee..7c548119 100644 --- a/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/x16Data.pck +++ b/Minecraft.Client/Common/res/TitleUpdate/DLC/Candy/Data/x16Data.pck |