From f660475905046bad3886116446b0cfeafb328b17 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 4 Aug 2013 09:03:10 +0200
Subject: Added a global .user file to initialize debugging options.

This helps newly checked-out repositories get the proper debugging settings under MSVC.
---
 VC2008/MCServer.vcproj.user | 89 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 VC2008/MCServer.vcproj.user

(limited to 'VC2008')

diff --git a/VC2008/MCServer.vcproj.user b/VC2008/MCServer.vcproj.user
new file mode 100644
index 000000000..b53d3ff35
--- /dev/null
+++ b/VC2008/MCServer.vcproj.user
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="9,00"
+	ShowAllFiles="false"
+	>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory="..\MCServer"
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor="0"
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory="..\MCServer"
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor="0"
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release profiled|Win32"
+			>
+			<DebugSettings
+				Command="$(TargetPath)"
+				WorkingDirectory="..\MCServer"
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="ASAGA"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor="0"
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioUserFile>
-- 
cgit v1.2.3


From 073bcd0361ff1634bcb3c7c8f075592500997b55 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 5 Aug 2013 10:43:43 +0200
Subject: Added the Carpet block.

---
 VC2008/MCServer.vcproj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'VC2008')

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 6fcd55388..dc0291cd6 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -1832,6 +1832,10 @@
 					RelativePath="..\source\blocks\BlockCactus.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\Blocks\BlockCarpet.h"
+					>
+				</File>
 				<File
 					RelativePath="..\source\Blocks\BlockCauldron.h"
 					>
-- 
cgit v1.2.3