From a4a418a679f1ac760a8763edd856f0178cfc6dde Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Fri, 25 May 2012 07:18:52 +0000
Subject: Merged the composable_generator branch into the trunk

git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 VC2008/MCServer.vcproj | 128 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 90 insertions(+), 38 deletions(-)

(limited to 'VC2008')

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 41727364d..84a4ebad2 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -264,6 +264,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\source\BlockID.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\source\BlockID.h"
 				>
@@ -336,14 +340,6 @@
 				RelativePath="..\source\cFurnaceRecipe.h"
 				>
 			</File>
-			<File
-				RelativePath="..\source\cGenSettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\source\cGenSettings.h"
-				>
-			</File>
 			<File
 				RelativePath="..\source\cGroup.cpp"
 				>
@@ -462,22 +458,6 @@
 				RelativePath="..\source\cPiston.h"
 				>
 			</File>
-			<File
-				RelativePath="..\source\cPlugin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\source\cPlugin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\source\cPluginManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\source\cPluginManager.h"
-				>
-			</File>
 			<File
 				RelativePath="..\source\cRecipeChecker.cpp"
 				>
@@ -1659,6 +1639,14 @@
 					RelativePath="..\source\cLuaCommandBinder.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\cPlugin.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\cPlugin.h"
+					>
+				</File>
 				<File
 					RelativePath="..\source\cPlugin_Lua.cpp"
 					>
@@ -1675,6 +1663,14 @@
 					RelativePath="..\source\cPlugin_NewLua.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\cPluginManager.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\cPluginManager.h"
+					>
+				</File>
 				<File
 					RelativePath="..\source\cStringMap.cpp"
 					>
@@ -1747,14 +1743,6 @@
 					RelativePath="..\source\FastNBT.h"
 					>
 				</File>
-				<File
-					RelativePath="..\source\NBT.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\source\NBT.h"
-					>
-				</File>
 				<File
 					RelativePath="..\source\WorldStorage.cpp"
 					>
@@ -1783,6 +1771,14 @@
 			<Filter
 				Name="Generating"
 				>
+				<File
+					RelativePath="..\source\BioGen.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\BioGen.h"
+					>
+				</File>
 				<File
 					RelativePath="..\source\cChunkGenerator.cpp"
 					>
@@ -1792,31 +1788,87 @@
 					>
 				</File>
 				<File
-					RelativePath="..\source\cWorldGenerator.cpp"
+					RelativePath="..\source\CompoGen.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\CompoGen.h"
+					>
+				</File>
+				<File
+					RelativePath="..\source\FinishGen.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\FinishGen.h"
+					>
+				</File>
+				<File
+					RelativePath="..\source\HeiGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cWorldGenerator.h"
+					RelativePath="..\source\HeiGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cWorldGenerator_Test.cpp"
+					RelativePath="..\source\StructGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cWorldGenerator_Test.h"
+					RelativePath="..\source\StructGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WGFlat.cpp"
+					RelativePath="..\source\Trees.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WGFlat.h"
+					RelativePath="..\source\Trees.h"
 					>
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Config files"
+			>
+			<File
+				RelativePath="..\banned.ini"
+				>
+			</File>
+			<File
+				RelativePath="..\furnace.txt"
+				>
+			</File>
+			<File
+				RelativePath="..\groups.ini"
+				>
+			</File>
+			<File
+				RelativePath="..\items.ini"
+				>
+			</File>
+			<File
+				RelativePath="..\monsters.ini"
+				>
+			</File>
+			<File
+				RelativePath="..\settings.ini"
+				>
+			</File>
+			<File
+				RelativePath="..\users.ini"
+				>
+			</File>
+			<File
+				RelativePath="..\webadmin.ini"
+				>
+			</File>
+			<File
+				RelativePath="..\world\world.ini"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\makefile"
 			>
-- 
cgit v1.2.3