backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-28 02:42:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'tu19-take-2' of https://github.com/4jcraft/4jcraft into tu19-take-2

Browse source
This commit is contained in:
Tropical 2026-03-22 13:51:03 -05:00
parent c17408b34d 1c7b4c0add
commit b0feb8ae57
3 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Minecraft.Assets/Windows64Media/loc/en-EN/strings.lang
View file

@ -4809,6 +4809,42 @@ Would you like to unlock the full game?</value>
<data name="IDS_LEADERBOARD_GAMERTAG">
<value>Gamertag</value>
</data>
<data name="IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL">
<value>Mining Blocks Peaceful</value>
</data>
<data name="IDS_LEADERBOARD_MINING_BLOCKS_EASY">
<value>Mining Blocks Easy</value>
</data>
<data name="IDS_LEADERBOARD_MINING_BLOCKS_NORMAL">
<value>Mining Blocks Normal</value>
</data>
<data name="IDS_LEADERBOARD_MINING_BLOCKS_HARD">
<value>Mining Blocks Hard</value>
</data>
<data name="IDS_LEADERBOARD_FARMING_PEACEFUL">
<value>Farming Peaceful</value>
</data>
<data name="IDS_LEADERBOARD_FARMING_EASY">
<value>Farming Easy</value>
</data>
<data name="IDS_LEADERBOARD_FARMING_NORMAL">
<value>Farming Normal</value>
</data>
<data name="IDS_LEADERBOARD_FARMING_HARD">
<value>Farming Hard</value>
</data>
<data name="IDS_LEADERBOARD_TRAVELLING_PEACEFUL">
<value>Traveling Peaceful</value>
</data>
<data name="IDS_LEADERBOARD_TRAVELLING_EASY">
<value>Traveling Easy</value>
</data>
<data name="IDS_LEADERBOARD_TRAVELLING_NORMAL">
<value>Traveling Normal</value>
</data>
<data name="IDS_LEADERBOARD_TRAVELLING_HARD">
<value>Traveling Hard</value>
</data>
<data name="IDS_PROGRESS_SAVING_LEVEL">
<value>Preparing to Save Level</value>
@ -7222,6 +7258,9 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
<data name="IDS_PLATFORM_NAME">
<value>Xbox 360</value>
</data>
<data name="IDS_OK">
<value>OK</value>
</data>
<data name="IDS_BACK_BUTTON">
<value>Back</value>
</data>

4
Minecraft.Client/Platform/Common/UI/IUIScene_HUD.cpp
View file

@ -1,6 +1,6 @@
#include "../../stdafx.h"
#include "../../../../Minecraft.Client/Minecraft.h"
#include "../../../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"\
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.ai.attributes.h"

4
Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.cpp
View file

@ -2,8 +2,8 @@
#include "UI.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#include "../../Minecraft.h"
#include "../../LocalPlayer.h"
#include "../../../Minecraft.h"
#include "../../../Player/LocalPlayer.h"
#include "UIScene_FireworksMenu.h"
UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData,