From b7bd6044882a00766c2dbd78c40854f7bab34804 Mon Sep 17 00:00:00 2001
From: Maverick Motherfucker <MMavipc@hostedyou.com>
Date: Sun, 29 May 2011 23:39:24 -0700
Subject: [PATCH] We have an icon now motherfuckas

---
 .gitignore      | 7 ++++---
 Terraria.csproj | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42d05810..b9fba22e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 *.exe
 *.o
 *.so
+/bin/*
+/obj/*
 
 # Packages #
 ############
@@ -32,12 +34,11 @@
 ehthumbs.db
 Icon?
 Thumbs.db
-/bin
-/obj
 
 
 # Visual Studio shit Motherfucka #
 ##################################
 *.suo
 *.sdf
-*.opensdf
\ No newline at end of file
+*.opensdf
+*.csproj.user
\ No newline at end of file
diff --git a/Terraria.csproj b/Terraria.csproj
index 096af038..bce3598f 100644
--- a/Terraria.csproj
+++ b/Terraria.csproj
@@ -6,7 +6,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1528EA3F-A6D2-49F6-BF75-7A842CF4D97B}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <AssemblyName>Terraria</AssemblyName>
+    <AssemblyName>TShock</AssemblyName>
     <OutputType>WinExe</OutputType>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
@@ -29,6 +29,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Terraria\Game.ico</ApplicationIcon>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Reference Include="Microsoft.Xna.Framework.Game" />
@@ -65,6 +68,7 @@
     <Compile Include="Terraria\NetMessage.cs" />
     <Compile Include="Terraria\Dust.cs" />
     <Compile Include="Terraria\Player.cs" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Terraria\Game.ico" />