Merge branch 'dev' into pathfinding
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <array>
|
||||
#include <set>
|
||||
|
||||
#include "data/dv.hpp"
|
||||
#include "maths/UVRegion.hpp"
|
||||
@@ -261,6 +262,8 @@ public:
|
||||
|
||||
std::unique_ptr<Variants> variants;
|
||||
|
||||
std::vector<std::string> tags;
|
||||
|
||||
/// @brief Runtime indices (content indexing results)
|
||||
struct {
|
||||
/// @brief block runtime integer id
|
||||
@@ -285,6 +288,8 @@ public:
|
||||
itemid_t pickingItem = 0;
|
||||
|
||||
blockid_t surfaceReplacement = 0;
|
||||
|
||||
std::set<int> tags;
|
||||
} rt {};
|
||||
|
||||
Block(const std::string& name);
|
||||
|
||||
Reference in New Issue
Block a user