Revela b58f7c8fdd Merge remote-tracking branch 'upstream/main' ...

# Conflicts:
#	Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
#	Minecraft.Client/Minecraft.Client.vcxproj
#	Minecraft.Client/Minecraft.Client.vcxproj.filters
#	Minecraft.Server/Minecraft.Server.vcxproj
#	Minecraft.World/Minecraft.World.vcxproj
#	Minecraft.World/Minecraft.World.vcxproj.filters
#	README.md

2026-03-17 17:26:40 -05:00

..

Access

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

cmake/sources

Move project to CMake (#781)

2026-03-17 16:39:22 -05:00

Common

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

Console

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

docs

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

vendor

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

Windows64

Merge remote-tracking branch 'upstream/main'

2026-03-17 17:26:40 -05:00

CMakeLists.txt

Move project to CMake (#781)

2026-03-17 16:39:22 -05:00

ServerLogger.cpp

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

ServerLogger.h

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

ServerLogManager.cpp

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

ServerLogManager.h

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

ServerProperties.cpp

Change default for hardcore-ban-ip to false

2026-03-16 08:10:40 -05:00

ServerProperties.h

Add hardcore-ban-ip property for IP banning on hardcore death

2026-03-16 08:00:48 -05:00

ServerShutdown.h

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

WorldManager.cpp

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00

WorldManager.h

Dedicated Server Software - Minecraft.Server.exe (#498)

2026-03-15 02:32:50 -05:00