maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.5

Browse Source
This commit is contained in:
Tom Hicks
2014-08-29 22:05:47 -07:00
parent 4f2adc52b0 487e745870
commit 5b70ac1edb
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Metropolis/pom.xml
View File

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

1
Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/commands/MetropolisHomeEvictCommand.java
View File

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