Merge branch 'master' of git://github.com/DrAgonmoray/minecraft-ancient-gates
Conflicts: src/org/mcteam/ancientgates/MyLocationTypeAdapter.java src/org/mcteam/ancientgates/Plugin.java src/org/mcteam/ancientgates/commands/CommandSetFrom.java src/org/mcteam/ancientgates/listeners/PluginBlockListener.java src/org/mcteam/ancientgates/listeners/PluginPlayerListener.java src/org/mcteam/ancientgates/util/FloodUtil.java
This commit is contained in:
@ -2,6 +2,10 @@
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Tim/minecraft/bukkit/1000/bukkit-0.0.1-SNAPSHOT.jar" sourcepath="/Bukkit"/>
|
||||
<classpathentry kind="lib" path="/Volumes/Data HD/Users/tobi/Code/bukkit-1.1-R5-20120224.051137-12.jar" sourcepath="/Users/tobi/Desktop/Bukkit">
|
||||
<attributes>
|
||||
<attribute name="javadoc_location" value="http://jd.bukkit.org/apidocs/"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
Reference in New Issue
Block a user