1.2.0 Dev

[HOTFIX CODE] Added an option for players to confirm when an alias costs. (Per alias adjustable)

pom.xml

@@ -6,11 +6,8 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>Alias</artifactId>
-<<<<<<< Updated upstream
-    <version>1.1.7</version>
-=======
+
     <version>1.2.0_DEV-1</version>
->>>>>>> Stashed changes
     <packaging>jar</packaging>
 
     <name>T2C-Alias</name>
@@ -23,10 +20,7 @@
     <url>T2Code.net</url>
 
     <build>
-<<<<<<< Updated upstream
-=======
         <finalName>${project.name}_${project.version}</finalName>
->>>>>>> Stashed changes
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -77,7 +71,7 @@
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>T2CodeLib</artifactId>
-            <version>13.4</version>
+            <version>14.4</version>
         </dependency>
         <dependency>
             <groupId>net.t2code</groupId>