merged master

This commit is contained in:
2020-08-20 10:43:37 -05:00
parent 42597c2a7a
commit d6e1f57c23
8 changed files with 3283 additions and 2 deletions

View File

@@ -15,7 +15,7 @@ int settings::SPAWN_X = 179213;
int settings::SPAWN_Y = 268451;
int settings::SPAWN_Z = -4210;
std::string settings::MOTDSTRING;
std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
void settings::init() {
INIReader reader("config.ini");