From 106b3ce9c003c91641f12eae445cd4c06e713fcb Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Thu, 14 Nov 2013 10:36:24 -0600 Subject: [PATCH] complete merge --- Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm | 4 ++-- .../MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm | 4 ++-- .../MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm | 4 ++-- Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm | 4 ++-- Server Files/MPMissions/TEMPLATE/mission.sqm | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm index c6369d63d..d9a000475 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm @@ -30,8 +30,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Takistan DayZ Epoch"; - briefingDescription="Takistan DayZ Epoch Private Server"; + briefingName="DayZ Epoch Takistan"; + briefingDescription="DayZ Epoch Takistan Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm index d24c6c051..3b6a2d71d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/mission.sqm @@ -31,8 +31,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Mountains ACR DayZ_Epoch"; - briefingDescription="Mountains ACR DayZ_Epoch Private Server"; + briefingName="DayZ Epoch Mountains ACR"; + briefingDescription="DayZ Epoch Mountains ACR Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm index 013a107f7..3fa459c38 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/mission.sqm @@ -32,8 +32,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Isla Duala DayZ Epoch"; - briefingDescription="Isla Duala DayZ Epoch Private Server"; + briefingName="DayZ Epoch Isla Duala"; + briefingDescription="DayZ Epoch Isla Duala Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm index 839c364a1..b494a438b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/mission.sqm @@ -29,8 +29,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="tavi DayZ_Epoch"; - briefingDescription="tavi DayZ_Epoch Private Server"; + briefingName="DayZ Epoch Taviana"; + briefingDescription="DayZ Epoch Taviana Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm index cdde073fb..2026f519b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/mission.sqm @@ -32,8 +32,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Namalsk DayZ Epoch"; - briefingDescription="Namalsk DayZ Epoch Private Server"; + briefingName="DayZ Epoch Namalsk"; + briefingDescription="DayZ Epoch Namalsk Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm index a1b02ff4c..ce0f16814 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/mission.sqm @@ -32,8 +32,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="utes DayZ Epoch"; - briefingDescription="utes DayZ Epoch Private Server"; + briefingName="DayZ Epoch Utes"; + briefingDescription="DayZ Epoch Utes Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm index 58efcb5bc..2c146fdfe 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/mission.sqm @@ -43,8 +43,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Fapovo DayZ Epoch"; - briefingDescription="Fapovo DayZ Epoch Private Server"; + briefingName="DayZ Epoch Fapovo"; + briefingDescription="DayZ Epoch Fapovo Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm index b87465a5b..5fd1825c0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/mission.sqm @@ -31,8 +31,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Shapur BAF DayZ Epoch"; - briefingDescription="Shapur BAF DayZ Epoch Private Server"; + briefingName="DayZ Epoch Shapur BAF"; + briefingDescription="DayZ Epoch Shapur BAF Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm index 5deb7f5c1..4e333104b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/mission.sqm @@ -30,8 +30,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Zargabad DayZ Epoch"; - briefingDescription="Zargabad DayZ Epoch Private Server"; + briefingName="DayZ Epoch Zargabad"; + briefingDescription="DayZ Epoch Zargabad Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm index e82da80fd..c2d134acf 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/mission.sqm @@ -29,8 +29,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Bootcamp ACR DayZ_Epoch"; - briefingDescription="Bootcamp ACR DayZ_Epoch Private Server"; + briefingName="DayZ Epoch Bootcamp ACR"; + briefingDescription="DayZ Epoch Bootcamp ACR Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm index 9fafd542e..588de3244 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/mission.sqm @@ -45,8 +45,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Dingor DayZ Epoch"; - briefingDescription="Dingor DayZ Epoch Private Server"; + briefingName="DayZ Epoch Dingor"; + briefingDescription="DayZ Epoch Dingor Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm index c42d7405d..3a3a27139 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/mission.sqm @@ -44,8 +44,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Lingor DayZ Epoch"; - briefingDescription="Lingor DayZ Epoch Private Server"; + briefingName="DayZ Epoch Lingor"; + briefingDescription="DayZ Epoch Lingor Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm index be1aea2ae..c1ad38bd3 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/mission.sqm @@ -29,8 +29,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Proving Grounds PMC DayZ_Epoch"; - briefingDescription="Proving Grounds PMC DayZ_Epoch Private Server"; + briefingName="DayZ Epoch Proving Grounds PMC"; + briefingDescription="DayZ Epoch Proving Grounds PMC Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm index 4ca4ba6fb..775ec3419 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/mission.sqm @@ -29,8 +29,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Woodland ACR DayZ_Epoch"; - briefingDescription="Woodland ACR DayZ_Epoch Private Server"; + briefingName="DayZ Epoch Woodland ACR"; + briefingDescription="DayZ Epoch Woodland ACR Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/Server Files/MPMissions/TEMPLATE/mission.sqm b/Server Files/MPMissions/TEMPLATE/mission.sqm index 61316b40a..672c52976 100644 --- a/Server Files/MPMissions/TEMPLATE/mission.sqm +++ b/Server Files/MPMissions/TEMPLATE/mission.sqm @@ -26,8 +26,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="Proving Grounds PMC DayZ_Epoch"; - briefingDescription="Proving Grounds PMC DayZ_Epoch Private Server"; + briefingName="DayZ Epoch Proving Grounds PMC"; + briefingDescription="DayZ Epoch Proving Grounds PMC Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008;