mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-06 03:21:49 +00:00
Merge branch 'main' into entities
This commit is contained in:
commit
3cafc39555
15 changed files with 554 additions and 9 deletions
|
|
@ -293,4 +293,4 @@ void Player::convert(dynamic::Map* data, const ContentLUT* lut) {
|
|||
Inventory::convert(inventory.get(), lut);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -104,4 +104,4 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
#endif // SRC_OBJECTS_PLAYER_HPP_
|
||||
#endif // SRC_OBJECTS_PLAYER_HPP_
|
||||
Loading…
Add table
Add a link
Reference in a new issue