From e94473b21ba35b757ed46a9a9bc0f686a003ee63 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 14 Feb 2012 15:32:17 -0800
Subject: [PATCH] Back to active development

---
 Changelog.txt | 6 ++++--
 pom.xml       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 7125d9525..bf0c121bc 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,8 @@
 Changelog:
 #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
-
+Version 2.0-dev
+ - Fixed /mcability not respecting permissions
+ 
 Version 1.2.12
  - Fixed issue that caused terrible MySQL performance and negative XP on levelup (Issue #134)
  - Fixed addxp command taking xprate and skill modifiers into account
@@ -11,7 +13,7 @@ Version 1.2.12
  - Fixed error with Skull Splitter / Serrated Strikes that caused server instability and log spam
  - Fixed config.yml not having values for End Stone & other new mining blocks
  - Fixed Green Thumb/Green Terra not correctly planting wheat (Issue #133)
- - Fixed /mcability not respecting permissions
+
 
 Version 1.2.11
  - Removed legacy Permission & PEX dependency. (PEX still works fine with mcMMO)
diff --git a/pom.xml b/pom.xml
index 23b56c442..73ff5ba01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,5 +121,5 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <version>1.2.12</version>
+    <version>2.0.00-dev</version>
 </project>