ementalo 283a9ce9fa 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

2012-06-25 22:01:59 +01:00

..

src

Merge branch 'master' into 3.0

2012-06-25 22:01:59 +01:00

pom.xml

Complete the transition to maven :D

2012-03-04 10:37:05 +11:00