diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-06-25 22:01:59 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-06-25 22:01:59 +0100 |
| commit | 283a9ce9fa66427e342e236edfdec81cbd0fc01f (patch) | |
| tree | 4bd19425e0c22336323794f081b512f52abaee4b /pom.xml | |
| parent | 7ce9e42f35a151e4285809d4eea5f2e1f593a966 (diff) | |
| parent | ecfa7454843cb9f4af61127c1a59838c83bf94fd (diff) | |
| download | Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar.gz Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar.lz Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar.xz Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.zip | |
Merge branch 'master' into 3.0
More to follow
Conflicts:
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
Essentials/src/com/earth2me/essentials/Kit.java
Essentials/src/com/earth2me/essentials/Teleport.java
Essentials/src/com/earth2me/essentials/User.java
Essentials/src/com/earth2me/essentials/UserData.java
Essentials/src/com/earth2me/essentials/commands/Commandfly.java
Essentials/src/com/earth2me/essentials/commands/Commandgod.java
Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
Essentials/src/com/earth2me/essentials/commands/Commandkit.java
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
Essentials/src/items.csv
Essentials/src/messages.properties
Essentials/src/messages_cs.properties
Essentials/src/messages_da.properties
Essentials/src/messages_de.properties
Essentials/src/messages_en.properties
Essentials/src/messages_es.properties
Essentials/src/messages_fr.properties
Essentials/src/messages_it.properties
Essentials/src/messages_nl.properties
Essentials/src/messages_pl.properties
Essentials/src/messages_pt.properties
EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java
EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java
EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -74,7 +74,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <bukkit.version>1.2.5-R3.1-SNAPSHOT</bukkit.version> + <bukkit.version>1.2.5-R4.0</bukkit.version> <build.number>Unknown</build.number> <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> |