From 6811ed551c2d306cae072fed56205dc8b582b63e Mon Sep 17 00:00:00 2001
From: Daniel Vidmar <daniel.viddy@gmail.com>
Date: Sat, 21 Feb 2015 13:25:44 -0500
Subject: [PATCH] Fixed issues created from bad merge during rebase

---
 TrueCraft.API/TrueCraft.API.csproj            |  5 +--
 .../Logic/Items/FlintAndSteelItem.cs          | 43 +++++++++++++++++++
 TrueCraft.Core/TrueCraft.Core.csproj          |  7 ---
 TrueCraft/Program.cs                          |  4 --
 4 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 TrueCraft.Core/Logic/Items/FlintAndSteelItem.cs

diff --git a/TrueCraft.API/TrueCraft.API.csproj b/TrueCraft.API/TrueCraft.API.csproj
index 565b344..56e7b11 100644
--- a/TrueCraft.API/TrueCraft.API.csproj
+++ b/TrueCraft.API/TrueCraft.API.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,7 +31,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Coordinates3D.cs" />
-    <Compile Include="ArmourMaterial.cs" />
     <Compile Include="PlantSpecies.cs" />
     <Compile Include="OreTypes.cs" />
     <Compile Include="ToolMaterial.cs" />
@@ -105,4 +104,4 @@
       <Name>fNbt</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/FlintAndSteelItem.cs b/TrueCraft.Core/Logic/Items/FlintAndSteelItem.cs
new file mode 100644
index 0000000..3fbd206
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/FlintAndSteelItem.cs
@@ -0,0 +1,43 @@
+using System;
+using TrueCraft.API.Logic;
+using TrueCraft.API;
+
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public class FlintAndSteelItem : ToolItem, ICraftingRecipe
+    {
+        public static readonly short ItemID = 0x103;
+        public override short ID { get { return 0x103; } }
+        public override sbyte MaximumStack { get { return 1; } }
+        public override short BaseDurability { get { return 65; } }
+        public override string DisplayName { get { return "Flint and Steel"; } }
+
+        public ItemStack[,] Pattern
+        {
+            get
+            {
+                return new[,]
+                {
+                    { new ItemStack(IronIngotItem.ItemID), new ItemStack(FlintItem.ItemID) }
+                };
+            }
+        }
+
+        public ItemStack Output
+        {
+            get
+            {
+                return new ItemStack(ItemID);
+            }
+        }
+
+        public bool SignificantMetadata
+        {
+            get
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/TrueCraft.Core/TrueCraft.Core.csproj b/TrueCraft.Core/TrueCraft.Core.csproj
index 16516d7..7d5125c 100644
--- a/TrueCraft.Core/TrueCraft.Core.csproj
+++ b/TrueCraft.Core/TrueCraft.Core.csproj
@@ -296,14 +296,7 @@
     <Compile Include="MathHelper.cs" />
     <Compile Include="Logging\PacketLogging.cs" />
     <Compile Include="Logging\FileLogProvider.cs" />
-    <Compile Include="Entities\Entity.cs" />
-    <Compile Include="Entities\EntityEventArgs.cs" />
-    <Compile Include="Entities\ItemEntity.cs" />
-    <Compile Include="Entities\LivingEntity.cs" />
-    <Compile Include="Entities\ObjectEntity.cs" />
-    <Compile Include="Entities\PlayerEntity.cs" />
     <Compile Include="Logic\Blocks\AirBlock.cs" />
-    <Compile Include="Entities\EntityFlags.cs" />
     <Compile Include="Windows\CraftingBenchWindow.cs" />
     <Compile Include="Networking\Packets\CloseWindowPacket.cs" />
     <Compile Include="Logic\Items\ArmorItem.cs" />
diff --git a/TrueCraft/Program.cs b/TrueCraft/Program.cs
index e387bff..53c85d8 100644
--- a/TrueCraft/Program.cs
+++ b/TrueCraft/Program.cs
@@ -64,11 +64,7 @@ namespace TrueCraft
             {
                 e.PreventDefault = true;
                 var messageArray = e.Message.TrimStart('/')
-<<<<<<< HEAD
                     .Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries);
-=======
-                .Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
->>>>>>> New terrain generator
                 CommandManager.HandleCommand(e.Client, messageArray[0], messageArray);
                 return;
             }