Merge remote-tracking branch 'refs/remotes/origin/master' into visitor

This commit is contained in:
sk89q
2014-04-01 16:13:18 -07:00
5 changed files with 20 additions and 47 deletions

View File

@@ -137,7 +137,7 @@
<dependency> <!-- NMS blocks -->
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.7.2-R0.3</version>
<version>1.7.5-R0.1-SNAPSHOT</version>
<scope>compile</scope>
<type>jar</type>
<optional>true</optional>