mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
83063f4b73
Conflict resolution summary: - .gitignore: kept dedicated-server-specific ignore entries (tmp*/, _server_asset_probe/, server-data/) and also kept main-side entries (*.user, /out). - Minecraft.Client/Common/Network/GameNetworkManager.cpp: kept int64_t seed from main and preserved dedicatedNoLocalHostPlayer logic from dedicated-server. - Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp: preserved dedicated-server shutdown flow and also included main-side cleanup for s_smallIdToSocketLock. |
||
|---|---|---|
| .. | ||
| 4JLibs | ||
| GameConfig | ||
| Iggy | ||
| Leaderboards | ||
| Network | ||
| Sentient | ||
| Social | ||
| XML | ||
| KeyboardMouseInput.cpp | ||
| KeyboardMouseInput.h | ||
| Minecraft_Macros.h | ||
| PostProcesser.cpp | ||
| Resource.h | ||
| Windows64_App.cpp | ||
| Windows64_App.h | ||
| Windows64_Minecraft.cpp | ||
| Windows64_UIController.cpp | ||
| Windows64_UIController.h | ||
| Windows64_Xuid.h | ||
| Xbox_BuildVer.h | ||