Merge branch 'master' into 0.5

This commit is contained in:
2014-08-29 22:05:47 -07:00
2 changed files with 17 additions and 4 deletions

View File

@@ -22,10 +22,12 @@
</scm>
<repositories>
<!--
<repository>
<id>wg</id>
<url>http://files.zachsthings.com/repo</url>
</repository>
-->
<repository>
<id>sk89q</id>
<url>http://mvn2.sk89q.com/repo</url>
@@ -35,6 +37,18 @@
<id>bukkit-repo</id>
<url>http://repo.bukkit.org/content/groups/public</url>
</repository>
<repository>
<id>sonatype-nexus-releases</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</repository>
<repository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<dependencies>
@@ -42,21 +56,21 @@
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId>
<version>5.2</version>
<version>5.6.3</version>
</dependency>
<!-- Bukkit -->
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.2.5-R1.0</version>
<version>1.7.9-R0.2</version>
</dependency>
<!-- WorldGuard -->
<dependency>
<groupId>com.sk89q</groupId>
<artifactId>worldguard</artifactId>
<version>5.5</version>
<version>5.9</version>
</dependency>
</dependencies>

View File

@@ -4,7 +4,6 @@ import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.majinnaibu.bukkitplugins.metropolis.MetropolisPlugin;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;