backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-26 21:23:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.Client/Platform/Windows64
History
MatthewBeshay 6000900285 Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 
# Conflicts:
#	Minecraft.Client/Level/ServerLevel.cpp
#	Minecraft.Client/Minecraft.cpp
#	Minecraft.Client/MinecraftServer.cpp
#	Minecraft.Client/Network/ClientConnection.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp
#	Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp
#	Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp
#	Minecraft.Client/Platform/Durango/Durango_Minecraft.cpp
#	Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
#	Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/lex/lexer/lexertl/lexer.hpp
#	Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
#	Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
#	Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
#	Minecraft.Client/Platform/Xbox/Xbox_Minecraft.cpp
#	Minecraft.Client/Platform/stdafx.h
#	Minecraft.Client/Player/LocalPlayer.cpp
#	Minecraft.Client/Rendering/Chunk.cpp
#	Minecraft.Client/Rendering/EntityRenderers/ItemRenderer.cpp
#	Minecraft.Client/Rendering/GameRenderer.cpp
#	Minecraft.Client/Rendering/LevelRenderer.cpp
#	Minecraft.Client/Textures/BufferedImage.cpp
#	Minecraft.Client/UI/Screens/AchievementScreen.cpp
#	Minecraft.Client/UI/Screens/ContainerScreen.cpp
#	Minecraft.Client/UI/Screens/TrapScreen.cpp
#	Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
#	Minecraft.World/IO/Files/File.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/Util/C4JThread.cpp
2026-03-30 15:21:08 +11:00
..
4JLibs fix: restore Linux/common build after dead-branch purge 2026-03-26 20:54:08 +11:00
GameConfig feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
GameHDD/20140401093851 feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Iggy Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Leaderboards fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Miles hhhhh 2026-03-06 07:13:57 +01:00
Sentient merge Telemetry folder 2026-03-22 13:33:10 -05:00
Social fix: restore Linux/common build after dead-branch purge 2026-03-26 20:54:08 +11:00
XML feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Minecraft_Macros.h feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Resource.h feat: move script & folder refactor 2026-03-05 03:29:23 -05:00
Windows64_App.cpp TU19: merge Minecraft.Client/Platform/Common/UI 2026-03-22 11:44:26 -05:00
Windows64_App.h Use standard screenshot buffer types 2026-03-11 15:38:42 +11:00
Windows64_Minecraft.cpp Merge branch 'upstream-dev' into cleanup/shared-portability-reset-v2 2026-03-30 15:21:08 +11:00
Windows64_UIController.cpp refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00
Windows64_UIController.h fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
Xbox_BuildVer.h feat: move script & folder refactor 2026-03-05 03:29:23 -05:00