From 18a5b3eabbeebde6172ffa6e951cd9a021386981 Mon Sep 17 00:00:00 2001
From: juanjp600 <juanjprot@gmail.com>
Date: Fri, 1 Dec 2017 20:26:56 -0300
Subject: [PATCH] Update content package to 0.7, removed serverconfig.xml

---
 Barotrauma/BarotraumaShared/BarotraumaShared.projitems       | 5 +----
 .../ContentPackages/{Vanilla 0.6.xml => Vanilla 0.7.xml}     | 2 +-
 Barotrauma/BarotraumaShared/config.xml                       | 2 +-
 Barotrauma/BarotraumaShared/serverconfig.xml                 | 4 ----
 4 files changed, 3 insertions(+), 10 deletions(-)
 rename Barotrauma/BarotraumaShared/Data/ContentPackages/{Vanilla 0.6.xml => Vanilla 0.7.xml} (97%)
 delete mode 100644 Barotrauma/BarotraumaShared/serverconfig.xml

diff --git a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
index 49dc19662..5a8620689 100644
--- a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
+++ b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
@@ -733,7 +733,7 @@
     <Content Include="$(MSBuildThisFileDirectory)Content\waterbump.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.6.xml">
+    <Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.7.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="$(MSBuildThisFileDirectory)Icon.ico" />
@@ -743,9 +743,6 @@
     <Content Include="$(MSBuildThisFileDirectory)README.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)serverconfig.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="$(MSBuildThisFileDirectory)serversettings.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.6.xml b/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.7.xml
similarity index 97%
rename from Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.6.xml
rename to Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.7.xml
index 066046d1c..d58046a39 100644
--- a/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.6.xml	
+++ b/Barotrauma/BarotraumaShared/Data/ContentPackages/Vanilla 0.7.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<contentpackage name="Vanilla 0.6" path="Data/ContentPackages/Vanilla 0.6">
+<contentpackage name="Vanilla 0.7" path="Data/ContentPackages/Vanilla 0.7">
   <Item file="Content/Items/idcard.xml" />
   <Item file="Content/Items/itemlabel.xml" />
   <Item file="Content/Items/Artifacts/artifacts.xml" />
diff --git a/Barotrauma/BarotraumaShared/config.xml b/Barotrauma/BarotraumaShared/config.xml
index 14252273a..336ba9c4c 100644
--- a/Barotrauma/BarotraumaShared/config.xml
+++ b/Barotrauma/BarotraumaShared/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" musicvolume="0.5" soundvolume="0.5" verboselogging="false">
   <graphicsmode fullscreen="true" vsync="true" />
-  <contentpackage path="Data/ContentPackages/Vanilla 0.6.xml" />
+  <contentpackage path="Data/ContentPackages/Vanilla 0.7.xml" />
   <keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Attack="R" Run="LeftShift" Crouch="LeftControl" Chat="Tab" CrewOrders="C" />
   <gameplay>
     <jobpreferences>
diff --git a/Barotrauma/BarotraumaShared/serverconfig.xml b/Barotrauma/BarotraumaShared/serverconfig.xml
deleted file mode 100644
index 8d542f57b..000000000
--- a/Barotrauma/BarotraumaShared/serverconfig.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" verboselogging="true">
-  <contentpackage path="Data/ContentPackages/Vanilla 0.6.xml" />
-</config>