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

@ -7,8 +7,8 @@
WorkbenchTile::WorkbenchTile(int id) : Tile(id, Material::wood)
{
iconTop = NULL;
iconFront = NULL;
iconTop = nullptr;
iconFront = nullptr;
}
Icon *WorkbenchTile::getTexture(int face, int data)