Upstream merge

This commit is contained in:
Zach Brown
2014-07-08 16:10:12 -05:00
parent f50d1233d4
commit 18df89d601
10 changed files with 61 additions and 116 deletions

View File

@@ -10,24 +10,17 @@
</parent>
<groupId>org.spigotmc</groupId>
<artifactId>minecraft-server</artifactId>
<artifactId>minecraft-server-relocated</artifactId>
<version>1.7.9-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Minecraft Server</name>
<repositories>
<repository>
<id>repobo-snap</id>
<url>http://repo.bukkit.org/content/groups/public</url>
</repository>
</repositories>
<name>Minecraft Server Relocation</name>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<groupId>org.spigotmc</groupId>
<artifactId>minecraft-server</artifactId>
<version>1.7.9</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -69,4 +62,4 @@
</plugin>
</plugins>
</build>
</project>
</project>