Merge with upstream
This commit is contained in:
commit
ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
|
|
@ -81,7 +81,7 @@ int TreeTile::getWoodType(int data)
|
|||
shared_ptr<ItemInstance> TreeTile::getSilkTouchItemInstance(int data)
|
||||
{
|
||||
// fix to avoid getting silktouched sideways logs
|
||||
return shared_ptr<ItemInstance>(new ItemInstance(id, 1, getWoodType(data)));
|
||||
return std::make_shared<ItemInstance>(id, 1, getWoodType(data));
|
||||
}
|
||||
|
||||
void TreeTile::registerIcons(IconRegister *iconRegister)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue