Merge dev and resolve formatting conflicts

This commit is contained in:
MatthewBeshay
2026-03-30 19:00:30 +11:00
463 changed files with 12624 additions and 11227 deletions

View File

@@ -556,7 +556,6 @@ LevelChunk* OldChunkStorage::load(Level* level, CompoundTag* tag) {
}
}
// 4J removed - we shouldn't need this any more
#if !defined(_CONTENT_PACKAGE)