From bd27e5d5abaf3449ea1eac41d7f41e73fae58ebf Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sun, 2 Mar 2014 09:30:40 +0100
Subject: [PATCH 1/2] Bump version to v0.7.2dev

---
 AndorsTrail/AndroidManifest.xml                           | 2 +-
 .../com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java   | 8 ++++----
 AndorsTrailEdit/editor.html                               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 654b05ac0..d60179eb2 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
 	android:versionCode="42"
-	android:versionName="0.7.1"
+	android:versionName="0.7.2dev"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index baa8c29ec..03e194db4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -18,11 +18,11 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
 	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS;
+	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || true;
 	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 42;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.1";
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.2dev";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
diff --git a/AndorsTrailEdit/editor.html b/AndorsTrailEdit/editor.html
index e98d29a34..85bb9ecc1 100644
--- a/AndorsTrailEdit/editor.html
+++ b/AndorsTrailEdit/editor.html
@@ -15,7 +15,7 @@
 	<div class="andorsTrailLogo" id="title">
 		Andor's Trail Content Editor
 		<span id="version">
-			v0.7.1dev
+			v0.7.2dev
 		</span>
 	</div>
 	<div id="buttons">

From 2240a9e26bb461c8f7e37b07d7143222977ce93d Mon Sep 17 00:00:00 2001
From: Ian Haase <ian.haase2@gmail.com>
Date: Sun, 30 Mar 2014 20:32:47 +0200
Subject: [PATCH 2/2] added "Replace" object layer to the template file

---
 AndorsTrail/res/xml/template.tmx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AndorsTrail/res/xml/template.tmx b/AndorsTrail/res/xml/template.tmx
index 2112d6719..6848d7666 100644
--- a/AndorsTrail/res/xml/template.tmx
+++ b/AndorsTrail/res/xml/template.tmx
@@ -203,4 +203,5 @@
  <objectgroup name="Mapevents" width="30" height="30"/>
  <objectgroup name="Spawn" width="30" height="30"/>
  <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Replace" width="30" height="30"/>
 </map>