push 0.3.1 to experimental branch

This commit is contained in:
vbawol 2015-07-21 15:53:49 -05:00
parent c5f533afb2
commit 3af8f8beec
12 changed files with 3 additions and 2 deletions

View File

@ -15,7 +15,8 @@ WeatherChangeTime = 1200; // This controls how fast the weather changes as well
WeatherStaticForecast[] = {}; // Default: {75.5,0,{0,0,0},0,{1,1}}; // Clear day; {19,1,{1,1,40},1,{5,5}}; // Cold Foggy Rainy Overcast Windy; Format: {temp <scalar>,rain <scalar>,fog <array>,overcast <scalar>,wind <array>} WeatherStaticForecast[] = {}; // Default: {75.5,0,{0,0,0},0,{1,1}}; // Clear day; {19,1,{1,1,40},1,{5,5}}; // Cold Foggy Rainy Overcast Windy; Format: {temp <scalar>,rain <scalar>,fog <array>,overcast <scalar>,wind <array>}
events[] = { events[] = {
{ 3600, "CarnivalSpawner" }, // SECOND <scalar>, EVENT <string> { 3600, "CarnivalSpawner" }, // SECOND <scalar>, EVENT <string>
{ 1200, "EarthQuake" }, { 2400, "EarthQuake" },
{ 1800, "ChangeWeather" },
{ 1200, "ContainerSpawner" }, { 1200, "ContainerSpawner" },
{ 300, "PlantSpawner" } //No comma on last Entry { 300, "PlantSpawner" } //No comma on last Entry
}; };

View File

@ -1,7 +1,7 @@
// EPOCH SERVER CONFIG // EPOCH SERVER CONFIG
// GLOBAL SETTINGS // GLOBAL SETTINGS
hostname = "EpochMod.com (0.3.0.4|1.48) ID02 YourHost"; hostname = "EpochMod.com (0.3.1|1.48) ID02 YourHost";
password = ""; password = "";
passwordAdmin = "!CHANGE_THIS_PASSWORD!"; passwordAdmin = "!CHANGE_THIS_PASSWORD!";
serverCommandPassword = "!CHANGE_THIS_PASSWORD!"; serverCommandPassword = "!CHANGE_THIS_PASSWORD!";