Merge with upstream
This commit is contained in:
commit
ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
|
|
@ -12,7 +12,7 @@ const unsigned int SmoothStoneBrickTile::SMOOTH_STONE_BRICK_NAMES[SMOOTH_STONE_B
|
|||
|
||||
SmoothStoneBrickTile::SmoothStoneBrickTile(int id) : Tile(id, Material::stone)
|
||||
{
|
||||
icons = NULL;
|
||||
icons = nullptr;
|
||||
}
|
||||
|
||||
Icon *SmoothStoneBrickTile::getTexture(int face, int data)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue