From d56eba43437b2b9bf299cb0ce88fef222f36d5cf Mon Sep 17 00:00:00 2001
From: toksikk <sykikk+github@gmail.com>
Date: Fri, 31 Oct 2014 10:17:39 +0100
Subject: [PATCH 1/4] erster map entwurf zum testen! keine finale version

---
 HeatUp/src/de/heatup/resource/maps/map1.txt | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 HeatUp/src/de/heatup/resource/maps/map1.txt

diff --git a/HeatUp/src/de/heatup/resource/maps/map1.txt b/HeatUp/src/de/heatup/resource/maps/map1.txt
new file mode 100644
index 0000000..7a7e40c
--- /dev/null
+++ b/HeatUp/src/de/heatup/resource/maps/map1.txt
@@ -0,0 +1,24 @@
+################################
+#--11-----#-----------#222222--#
+#--11-----#-----------#222222--#
+#######################222222###
+#---------#----------#########-#
+###############-######---------#
+-------#---#--#-#------#########
+###############-########--#-----
+#--------3333-#-#----444--#-----
+#---#####3333-#-#####444########
+#--##---#3333-###------------#--
+####----#-----#-################
+#-------#######-#----#---------#
+#######----##---##########-#####
+------#######-###-##-----#-#-#-#
+#####-------#-#-####-55--#-#####
+-666################-55--#-#----
+-666#---#-#--------###--######--
+-666#---#-###---####-####--#-##-
+-666#---#---#-###777-#--##----#-
+-666#####---###-#777-#---#######
+----#-------#---##########88888#
+#############------#------88888#
+------------####################

From 0b7b8ee43f5e12b23078600c32534c293b014da3 Mon Sep 17 00:00:00 2001
From: toksikk <sykikk+github@gmail.com>
Date: Fri, 31 Oct 2014 10:20:09 +0100
Subject: [PATCH 2/4] umbennenung der resources

---
 HeatUp/src/de/heatup/{resource => resources}/maps/.gitkeep | 0
 HeatUp/src/de/heatup/{resource => resources}/maps/map1.txt | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename HeatUp/src/de/heatup/{resource => resources}/maps/.gitkeep (100%)
 rename HeatUp/src/de/heatup/{resource => resources}/maps/map1.txt (100%)

diff --git a/HeatUp/src/de/heatup/resource/maps/.gitkeep b/HeatUp/src/de/heatup/resources/maps/.gitkeep
similarity index 100%
rename from HeatUp/src/de/heatup/resource/maps/.gitkeep
rename to HeatUp/src/de/heatup/resources/maps/.gitkeep
diff --git a/HeatUp/src/de/heatup/resource/maps/map1.txt b/HeatUp/src/de/heatup/resources/maps/map1.txt
similarity index 100%
rename from HeatUp/src/de/heatup/resource/maps/map1.txt
rename to HeatUp/src/de/heatup/resources/maps/map1.txt

From ccf40de5a790d681bd6fbfc585043af65aedcc53 Mon Sep 17 00:00:00 2001
From: toksikk <sykikk+github@gmail.com>
Date: Fri, 31 Oct 2014 10:23:20 +0100
Subject: [PATCH 3/4] =?UTF-8?q?entfernte=20zeile,=20leichte=20=C3=A4nderun?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HeatUp/src/de/heatup/resources/maps/map1.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HeatUp/src/de/heatup/resources/maps/map1.txt b/HeatUp/src/de/heatup/resources/maps/map1.txt
index 7a7e40c..688914d 100644
--- a/HeatUp/src/de/heatup/resources/maps/map1.txt
+++ b/HeatUp/src/de/heatup/resources/maps/map1.txt
@@ -20,5 +20,5 @@
 -666#---#---#-###777-#--##----#-
 -666#####---###-#777-#---#######
 ----#-------#---##########88888#
-#############------#------88888#
-------------####################
+---##########------#------88888#
+------------####################
\ No newline at end of file

From 20d49198d2d0a7fa59b4f5e832e8d332793a929c Mon Sep 17 00:00:00 2001
From: toksikk <sykikk+github@gmail.com>
Date: Fri, 31 Oct 2014 10:29:51 +0100
Subject: [PATCH 4/4] =?UTF-8?q?entfernt,=20weil=20die=20klasse=20nur=20f?=
 =?UTF-8?q?=C3=BCr=20mich=20zum=20testen=20gedacht=20war?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HeatUp/src/de/heatup/mapengine/MapEngineTest.java | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 HeatUp/src/de/heatup/mapengine/MapEngineTest.java

diff --git a/HeatUp/src/de/heatup/mapengine/MapEngineTest.java b/HeatUp/src/de/heatup/mapengine/MapEngineTest.java
deleted file mode 100644
index 047dd31..0000000
--- a/HeatUp/src/de/heatup/mapengine/MapEngineTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package mapEngine;
-
-import java.io.IOException;
-
-import prp.GameInterface;
-
-public class MapEngineTest {
-
-	public static void main(String[] args) throws IOException {
-		MapEngine me = new MapEngine();
-		GameInterface gi = new GameInterface();
-		me.addAllGameTilesToPanel(gi.getGamePanel());
-	}
-
-}