Merge with upstream

This commit is contained in:
Soggy_Pancake 2026-03-14 14:51:06 -07:00
commit ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions

View file

@ -14,9 +14,9 @@ int SandStoneTile::SANDSTONE_NAMES[SANDSTONE_BLOCK_NAMES] = {
SandStoneTile::SandStoneTile(int id) : Tile(id, Material::stone)
{
icons = NULL;
iconTop = NULL;
iconBottom = NULL;
icons = nullptr;
iconTop = nullptr;
iconBottom = nullptr;
}
Icon *SandStoneTile::getTexture(int face, int data)