Merge remote-tracking branch 'Revelations/main' into upstream-merge
# Conflicts: # .github/workflows/nightly.yml # CMakeLists.txt # Minecraft.Client/CMakeLists.txt # Minecraft.Client/StringTable.cpp # Minecraft.Server/FourKitNatives.cpp # Minecraft.Server/Windows64/ServerMain.cpp # Minecraft.World/BiomeDecorator.cpp # Minecraft.World/BiomeSource.cpp # Minecraft.World/cmake/sources/Common.cmake # README.md # cmake/ServerTarget.cmake
This commit is contained in:
@@ -409,7 +409,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
|
||||
break;
|
||||
#endif
|
||||
|
||||
default: __debugbreak();
|
||||
default: DEBUG_BREAK();
|
||||
}
|
||||
|
||||
bool confirmUser = false;
|
||||
|
||||
Reference in New Issue
Block a user