fixing git

millennium-legacy/.classpath

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-<<<<<<< HEAD
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-=======
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

millennium-legacy/.project

@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-<<<<<<< HEAD
-	<name>EYS</name>
-=======
-	<name>Millenium Legacy</name>
->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>millennium-legacy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

millennium-legacy/.settings/org.eclipse.jdt.core.prefs

@@ -1,21 +1,11 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-<<<<<<< HEAD
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-=======
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-<<<<<<< HEAD
-org.eclipse.jdt.core.compiler.source=1.8
-=======
-org.eclipse.jdt.core.compiler.source=1.7
->>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7

millennium-legacy/src/milleniumlegacy/GUI.java

@@ -1,19 +1,17 @@
 package milleniumlegacy;
 
-<<<<<<< HEAD
+
 import java.awt.Component;
 import java.awt.Graphics;
 import java.util.HashMap;
 
 import javax.imageio.ImageIO;
-=======
->>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f
 import javax.swing.*;
 
 public class GUI {
 
 	public static void main(String[] args) {
-<<<<<<< HEAD
+
 			  JFrame f = new JFrame("Millenium Legacy");
 			  f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
 			  f.setContentPane(new JPanel() {
@@ -26,7 +24,7 @@ public class GUI {
 				f.setSize(825, 625);
 				f.setVisible(true);
 				Algorithm.research();
-=======
+				
 		SwingUtilities.invokeLater(new Runnable() {
 			public void run() {
 				createAndShowGUI();
@@ -45,7 +43,6 @@ public class GUI {
 		f.setSize(825, 625);
 		f.setVisible(true);
 		draw.start();
->>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f
 	}
 	
 }

millennium-legacy/src/milleniumlegacy/Item.java

@@ -3,7 +3,7 @@ import java.util.*;
 
 public class Item {
 	
-		public static final Map<Integer, String[]> items;
+		public static final HashMap<Integer, String[]> items;
 		static 
 		{
 		//Putting items