Merge branch 'devel' of github.com:TotalFreedom/TotalFreedomMod into TFM1.13-Alpha

# Conflicts:
#	pom.xml

README.md

@@ -1,7 +1,7 @@
 # TotalFreedomMod #
 
 
-[![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=TFM1.12-Alpha)](https://travis-ci.org/TotalFreedom/TotalFreedomMod)
+[![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=devel)](https://travis-ci.org/TotalFreedom/TotalFreedomMod)
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
 

nb-configuration.xml

@@ -14,6 +14,5 @@
         Any value defined here will override the pom.xml file value but is only applicable to the current project.
         -->
         <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
-        <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -16,7 +16,6 @@
         <tfm.build.author>${buildAuthor}</tfm.build.author>
         <tfm.build.head>${buildHead}</tfm.build.head>
         <jar.finalName>${project.name}</jar.finalName>
-        
         <maven.build.timestamp.format>dd/MM/yyyy hh:mm aa</maven.build.timestamp.format>
     </properties>
 
@@ -43,21 +42,42 @@
     </scm>
 
     <repositories>
-        <repository>
-            <id>ess-repo</id>
-            <url>http://repo.ess3.net</url>
-        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+
+        <repository>
+            <id>ess-repo</id>
+            <url>http://repo.ess3.net/content/groups/essentials</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
+
         <repository>
             <id>sk89q-snapshots</id>
             <url>http://maven.sk89q.com/artifactory/repo</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
         <repository>
             <id>CodeMC</id>
@@ -108,17 +128,19 @@
             <artifactId>Essentials</artifactId>
             <version>2.13.1</version>
         </dependency>
-
+ 
+        <!-- The following have been changed to Telesphoreo's personal repo as it is the most stable current TF-WorldEdit build. These will be changed to a TotalFreedom build in the future -->
+ 
         <dependency>
-            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
+            <groupId>com.github.Telesphoreo.TF-WorldEdit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>6.1.0-TF</version>
+            <version>7.0.0-TF-SNAPSHOT-R0.2</version>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
+            <groupId>com.github.Telesphoreo.TF-WorldEdit</groupId>
             <artifactId>worldedit-core</artifactId>
-            <version>6.1.0-TF</version>
+            <version>7.0.0-TF-SNAPSHOT-R0.2</version>
         </dependency>
         
         <dependency>
@@ -139,7 +161,6 @@
             </resource>
         </resources>
 
-
         <plugins>
             <!-- Compiler -->
             <plugin>
@@ -177,7 +198,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <!-- Antrun -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -203,7 +224,6 @@
                 </executions>
                
             </plugin>
-            
 
             <!-- Properties -->
             <plugin>

src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java

@@ -2,16 +2,9 @@ package me.totalfreedom.totalfreedommod.bridge;
 
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-// These imports are not in the latest releases of WorldEdit, and the new versions of WorldEdit do not build properly. This will need to be reverted once the new WorldEdit builds are building properly.
-//
-//import me.totalfreedom.worldedit.LimitChangedEvent;
-//import me.totalfreedom.worldedit.SelectionChangedEvent;
-//
-//The following two imports are a temporary measure as mentioned above.
-//
-import me.StevenLawson.worldedit.LimitChangedEvent;
-import me.StevenLawson.worldedit.SelectionChangedEvent;
-//
+import me.totalfreedom.worldedit.LimitChangedEvent;
+import me.totalfreedom.worldedit.SelectionChangedEvent;
+
 import net.pravian.aero.component.PluginListener;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;