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

Essentials/src/com/earth2me/essentials/Teleport.java

@@ -159,6 +159,13 @@ public class Teleport implements Runnable, ITeleport
 		try
 		{
 			user.checkCooldown(TimestampType.LASTTELEPORT, ess.getRanks().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS);
+			else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass"))
+			{
+				time.setTimeInMillis(lastTime);
+				time.add(Calendar.SECOND, (int)delay);
+				time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0));
+				throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis())));
+			}
 		}
 		catch (CooldownException ex)
 		{

Essentials/src/com/earth2me/essentials/commands/Commandkit.java

@@ -58,7 +58,8 @@ public class Commandkit extends EssentialsCommand
 	{
 		if (args.length < 2)
 		{
-			listKits(sender);
+			final String kitList = Kit.listKits(ess, null);
+			sender.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
 			throw new NoChargeException();
 		}
 		{

Essentials/src/com/earth2me/essentials/commands/Commandmute.java

@@ -28,6 +28,7 @@ public class Commandmute extends EssentialsCommand
 			throw new Exception(_("muteExempt"));
 		}
 		long muteTimestamp = 0;
+
 		if (args.length > 1)
 		{
 			final String time = getFinalArg(args, 1);

Essentials/src/com/earth2me/essentials/commands/Commandremove.java

@@ -8,7 +8,7 @@ import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 
-
+//Todo: Fix this up
 public class Commandremove extends EssentialsCommand
 {
 	private enum ToRemove

Essentials/src/messages_it.properties

@@ -440,5 +440,14 @@ year=anno
 years=anni
 youAreHealed=\u00a77Sei stato curato.
 youHaveNewMail=\u00a7cHai {0} messaggi!\u00a7f digita \u00a77/mail read\u00a7f per consultare la tua mail.
-hatRemoved=\u00a7eYour hat has been removed.
-banFormat=Banned: {0}
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
+vanished=\u00a7aYou have now been vanished.
+tps=Current TPS = {0}
+hatPlaced=\u00a7eEnjoy your new hat!
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
+noDurability=\u00a7cThis item does not have a durability.

Essentials/src/messages_nl.properties

@@ -440,5 +440,14 @@ year=jaar
 years=jaren
 youAreHealed=\u00a77Je bent genezen.
 youHaveNewMail=\u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
-hatRemoved=\u00a7eYour hat has been removed.
-banFormat=Banned: {0}
+expSet=\u00a7c{0} \u00a77now has\u00a7c {1} \u00a77exp.
+exp=\u00a7c{0} \u00a77has\u00a7c {1} \u00a77exp (level\u00a7c {2}\u00a77) and needs\u00a7c {3} \u00a77more exp to level up.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
+vanished=\u00a7aYou have now been vanished.
+tps=Current TPS = {0}
+hatPlaced=\u00a7eEnjoy your new hat!
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+durability=\u00a77This tool has \u00a7c{0}\u00a77 uses left
+noDurability=\u00a7cThis item does not have a durability.

Essentials/src/messages_pl.properties

@@ -1,4 +1,4 @@
-#version: ${build.number}
+#version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
 # by: losdamianos, edited by Rutr
@@ -35,7 +35,6 @@ cantFindGeoIpDB=Nie mozna znalezc bazy danych GeoIP!
 cantReadGeoIpDB=Odczytywanie bazy danych GeoIP zawiodlo!
 cantSpawnItem=\u00a7cNie mozesz stworzyc przedmiotu {0}.
 chatTypeLocal=[L]
-chatTypeAdmin=[A]
 chatTypeSpy=[Szpieg]
 commandFailed=Komenda {0} zawiodla.
 commandHelpFailedForPlugin=Blad podczas uzyskiwania pomocy dla: {0}
@@ -43,7 +42,7 @@ commandNotLoaded=\u00a7cKomenda {0} nie jest zaladowana!
 compassBearing=\u00a77Bearing:  {0} ({1} stopni).
 configFileMoveError=Nie udalo sie przeniesc config.yml do lokalizacji backupa.
 configFileRenameError=Nie udalo sie zmienic nazwy tymczasowego pliku na config.yml
-connectedPlayers=Obecni gracze: 
+connectedPlayers=Obecni gracze:
 connectionFailed=Blad podczas otwierania polaczenia.
 cooldownWithMessage=\u00a7cCooldown: {0}
 corruptNodeInConfig=\u00a74Notice: Twoj plik konfiguracyjny ma uszkodzony wpis: {0}
@@ -94,12 +93,11 @@ extinguishOthers=\u00a77Ugasiles {0}.
 failedToCloseConfig=Blad podczas zamykania configu {0}
 failedToCreateConfig=Blad podczas tworzenia configu {0}
 failedToWriteConfig=Blad podczas pisania configu {0}
-false=\u00a74false\u00a7f
+false=falsz
 feed=\u00a77Twoj glod zostal zaspokojony.
 feedOther=\u00a77Nakarmiono {0}.
 fileRenameError=Blad podczas zmiany nazwy pliku \u0093{0}\u0094.
 flyMode=\u00a77Latanie {0} dla {1}.
-flying=flying
 foreverAlone=\u00a7cNie masz komu odpisac.
 freedMemory=Zwolniono {0} MB.
 gameMode=\u00a77Ustawiono tryb gry {0} dla {1}.
@@ -115,7 +113,6 @@ godDisabledFor=Godmode wylaczony dla {0}.
 godEnabledFor=Godmode wlaczony dla {0}.
 godMode=\u00a77Godmode {0}.
 hatArmor=\u00a7cError, you cannot use this item as a hat!
-hatEmpty=\u00a7cYou are not wearing a hat.
 hatFail=\u00a7cMusisz cos trzymac w dloni.
 hatPlaced=\u00a7eCiesz sie nowym kapeluszem!
 haveBeenReleased=\u00a77Zostales wypuszczony.
@@ -255,7 +252,6 @@ notAllowedToQuestion=\u00a7cNie mozesz zadac tego pytania.
 notAllowedToShout=\u00a7cNie mozesz krzyczec..
 notEnoughExperience=Nie masz wystarczajaco duzo doswiadczenia.
 notEnoughMoney=Nie masz tyle pieniedzy.
-notFlying=not flying
 notRecommendedBukkit= * ! * Wersja Bukkita nie jest rekomendowana wersja dla Essentials.
 notSupportedYet=Jeszcze nie wspierane.
 nothingInHand = \u00a7cNie masz nic w reku..
@@ -375,7 +371,7 @@ tradeSignEmpty=Tabliczka handlowa nie jest dostepna dla Ciebie.
 tradeSignEmptyOwner=Nie ma nic do pobrania z tej tabliczki.
 treeFailure=\u00a7cUtworzenie drzewa nie powiodlo sie, sprobuj na trawie lub ziemi.
 treeSpawned=\u00a77Drzewo utworzono.
-true=\u00a72true\u00a7f
+true=prawda
 typeTpaccept=\u00a77Aby zaakceptowac teleport, wpisz \u00a7c/tpaccept\u00a77.
 typeTpdeny=\u00a77Aby odmowic teleportacji, wpisz \u00a7c/tpdeny\u00a77.
 typeWorldName=\u00a77Mozesz rowniez wpisac nazwe danego swiata.
@@ -417,22 +413,20 @@ weatherStorm=\u00a77Ustawiles burze w {0}.
 weatherStormFor=\u00a77Ustawiles burze w {0} na {1} sekund.
 weatherSun=\u00a77Ustawiles bezchmurna pogode w {0}.
 weatherSunFor=\u00a77Ustawiles bezchmurna pogode w {0} na {1} sekund.
-whoisAFK=\u00a76 - AFK:\u00a7f {0}
-whoisBanned=\u00a76 - Zbanowany:\u00a7f {0}.
-whoisExp=\u00a76 - Punkty Doswiadczenia:\u00a7f {0} (Poziom {1}).
-whoisFly=\u00a76 - Fly mode:\u00a7f {0} ({1})
-whoisGamemode=\u00a76 - Tryb Gry:\u00a7f {0}.
-whoisGeoLocation=\u00a76 - Lokalizacja:\u00a7f {0}.
-whoisGod=\u00a76 - Godmode:\u00a7f {0}.
-whoisHealth=\u00a76 - Zdrowie:\u00a7f {0}/20.
-whoisIPAddress=\u00a76 - Adres IP:\u00a7f {0}.
-whoisJail=\u00a76 - W wiezieniu:\u00a7f {0}.
-whoisLocation=\u00a76 - Lokalizacja:\u00a7f ({0}, {1}, {2}, {3})
-whoisMoney=\u00a76 - Pieniadze:\u00a7f {0}.
-whoisMuted=\u00a76 - Muted:\u00a7f {0}
-whoisNick=\u00a76 - Nick:\u00a7f {0}
-whoisOp=\u00a76 - OP:\u00a7f {0}
-whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
+whoisBanned=\u00a79 - Zbanowany: {0}.
+whoisExp=\u00a79 - Punkty Doswiadczenia: {0} (Poziom {1}).
+whoisGamemode=\u00a79 - Tryb Gry: {0}.
+whoisGeoLocation=\u00a79 - Lokalizacja: {0}.
+whoisGod=\u00a79 - Godmode: {0}.
+whoisHealth=\u00a79 - Zdrowie: {0}/20.
+whoisIPAddress=\u00a79 - Adres IP: {0}.
+whoisIs={0} jest {1}.
+whoisJail=\u00a79 - W wiezieniu: {0}.
+whoisLocation=\u00a79 - Lokalizacja: ({0}, {1}, {2}, {3})
+whoisMoney=\u00a79 - Pieniadze: {0}.
+whoisOP=\u00a79 - OP: {0}
+whoisStatusAvailable=\u00a79 - Status: Dostepny
+whoisStatusAway=\u00a79 - Status: \u00a7cNieobecny\u00a7f
 worth=\u00a77Stack {0} jest warty \u00a7c{1}\u00a77 ({2}rzedmiot(y) po {3} kazdy)
 worthMeta=\u00a77Stack {0} z metadata {1} jest warty \u00a7c{2}\u00a77 ({3} przedmiot(y) po {4} kazdy)
 worthSet=Cena przedmiotu ustawiona.
@@ -440,5 +434,3 @@ year=rok
 years=lat
 youAreHealed=\u00a77Zostales/as uleczony/na.
 youHaveNewMail=\u00a7cMasz {0} wiadomosci!\u00a7f napisz \u00a77/mail read\u00a7f  aby je przeczytac.
-hatRemoved=\u00a7eYour hat has been removed.
-banFormat=Banned: {0}

Essentials/src/messages_pt.properties

@@ -1,4 +1,4 @@
-#version: ${build.number}
+#version: TeamCity
 # Single quotes have to be doubled: ''
 # Translations start here
 # by: FurmigaHumana, completed by Iaccidentally
@@ -35,7 +35,6 @@ cantFindGeoIpDB=Nao foi poss\u00edvel encontrar o GeoIP database!
 cantReadGeoIpDB=Falhou em ler a GeoIP database!
 cantSpawnItem=\u00a7cVoc\u00ea nao tem permissao de pegar este item {0}
 chatTypeLocal=[L]
-chatTypeAdmin=[A]
 chatTypeSpy=[Spy]
 commandFailed=Comando {0} falhou:
 commandHelpFailedForPlugin=Erro ao obter ajuda para: {0}
@@ -43,7 +42,7 @@ commandNotLoaded=\u00a7cCommando {0} provavelmente esta carregado.
 compassBearing=\u00a77Inclina\u00e7ao:  {0} ({1} graus).
 configFileMoveError=Falha ao mover arquivo config.yml ao local de backup.
 configFileRenameError=Falha em renomear arquivo temporario em config.yml
-connectedPlayers=Jogadores conectados: 
+connectedPlayers=Jogadores conectados:
 connectionFailed=Falha ao abrir conexao.
 cooldownWithMessage=\u00a7cTempo de espera: {0}
 corruptNodeInConfig=\u00a74Aviso: Seu arquivo de configura\u00e7ao tem uma parte {0} corrompida.
@@ -94,12 +93,11 @@ extinguishOthers=\u00a77Voce foi extinguido {0}.
 failedToCloseConfig=Falha em fechar o arquivo de configura\u00e7ao {0}
 failedToCreateConfig=Falha em criar o arquivo de configura\u00e7ao {0}
 failedToWriteConfig=Falha em escrever no arquivo de configura\u00e7ao {0}
-false=\u00a74false\u00a7f
+false=falso
 feed=\u00a77Seu apetite foi saciado.
 feedOther=\u00a77Satisfeito {0}.
 fileRenameError=Falha ao renomear o arquivo {0}.
 flyMode=\u00a77Definir o modo de voar {0} para {1}.
-flying=flying
 foreverAlone=\u00a7cVoc\u00ea nao tem ninguem a quem responder.
 freedMemory=Livre {0} MB.
 gameMode=\u00a77Gamemode {0} definido para {1}.
@@ -114,10 +112,9 @@ geoipJoinFormat=Jogador {0} veio do {1}
 godDisabledFor=desativado para {0}
 godEnabledFor=ativado para {0}
 godMode=\u00a77Modo Deus {0}.
-hatArmor=\u00a7cDe erro, voce nao pode usar este item como um chapeu!
-hatEmpty=\u00a7cYou are not wearing a hat.
-hatFail=\u00a7cVoce deve ter algo para vestir na sua mao.
-hatPlaced=\u00a7eAproveite o seu novo chapeu!
+hatArmor=\u00a7cError, you cannot use this item as a hat!
+hatFail=\u00a7cYou must have something to wear in your hand.
+hatPlaced=\u00a7eEnjoy your new hat!
 haveBeenReleased=\u00a77Voc\u00ea foi liberado.
 heal=\u00a77Voc\u00ea foi curado.
 healOther=\u00a77Curado {0}.
@@ -127,7 +124,7 @@ helpLine=\u00a76/{0}\u00a7f: {1}
 helpMatching=\u00a77Comandos correspondentes "{0}":
 helpOp=\u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages=P\u00e1gina \u00a7c{0}\u00a7f of \u00a7c{1}\u00a7f:
-helpPlugin=\u00a74{0}\u00a7f: Ajuda Plugin: /help {1}
+helpPlugin=\u00a74{0}\u00a7f: Plugin Help: /help {1}
 holeInFloor=Buraco no chao
 homeSet=\u00a77Casa definida.
 homeSetToBed=\u00a77Sua casa agora esta definida a esta cama.
@@ -255,7 +252,6 @@ notAllowedToQuestion=\u00a7cVoc\u00ea nao esta autorizado a usar pergunta.
 notAllowedToShout=\u00a7cVoc\u00ea nao esta autorizado a gritar.
 notEnoughExperience=Voc\u00ea nao tem experiencia suficiente.
 notEnoughMoney=Voc\u00ea nao tem dinheiro suficiente.
-notFlying=not flying
 notRecommendedBukkit=* ! * Versao do bukkit nao \u00e9 a recomendada para o essentials.
 notSupportedYet=Ainda nao suportado.
 nothingInHand = \u00a7cVoc\u00ea nao tem nada em sua mao.
@@ -375,7 +371,7 @@ tradeSignEmpty=A placa de troca nao tem abastecimento suficiente.
 tradeSignEmptyOwner=Nao a nada para recolher desta placa de compra.
 treeFailure=\u00a7cFalha ao gerar \u00e1rvore. Tente denovo na terra ou grama.
 treeSpawned=\u00a77\u00c1rvore gerada.
-true=\u00a72true\u00a7f
+true=verdadeiro
 typeTpaccept=\u00a77Para aceitar o teleporte, digite \u00a7c/tpaccept\u00a77.
 typeTpdeny=\u00a77Para recusar o teleporte, digite \u00a7c/tpdeny\u00a77.
 typeWorldName=\u00a77Voc\u00ea tambem pode digitar o nome do mundo.
@@ -389,8 +385,8 @@ unknownItemName=Nome do item desconhecido: {0}
 unlimitedItemPermission=\u00a7cSem permissao para item ilimitado {0}.
 unlimitedItems=Item ilimitado:
 unmutedPlayer=Jogador {0} desmutado.
-unvanished=\u00a7aEsta mais uma vez visivel.
-unvanishedReload=\u00a7cA recarga foi forcado a se tornar visivel.
+unvanished=\u00a7aYou are once again visible.
+unvanishedReload=\u00a7cA reload has forced you to become visible.
 upgradingFilesError=Erro ao aprimorar os arquivos
 userDoesNotExist=O usu\u00e1rio {0} nao existe.
 userIsAway=[AFK]: {0} esta aus\u00eante.
@@ -400,7 +396,7 @@ userUsedPortal={0} usou um portal de saida existente.
 userdataMoveBackError=Falha ao mover userdata/{0}.tmp para userdata/{1}
 userdataMoveError=Falha ao mover userdata/{0} para userdata/{1}.tmp
 usingTempFolderForTesting=Usando pasta temporaria para teste:
-vanished=\u00a7aVoce agora desapareceu.
+vanished=\u00a7aYou have now been vanished.
 versionMismatch=Versao incompativel! Atualise o {0} para mesma versao.
 versionMismatchAll=Versao imcompativel! Atualise todos os essentials jars para mesma versao.
 voiceSilenced=\u00a77Sua voz foi silenciada
@@ -417,22 +413,20 @@ weatherStorm=\u00a77Voc\u00ea modificou o tempo para chuva em {0}
 weatherStormFor=\u00a77Voc\u00ea modificou o tempo para chuva em {0} por {1} segundos
 weatherSun=\u00a77Voc\u00ea modificou o tempo para sol em {0}
 weatherSunFor=\u00a77Voc\u00ea modificou o tempo para sol em {0} por {1} segundos
-whoisAFK=\u00a76 - AFK:\u00a7f {0}
-whoisBanned=\u00a76 - Banido:\u00a7f {0}
-whoisExp=\u00a76 - Exp:\u00a7f {0} (Level {1})
-whoisFly=\u00a76 - Fly modo:\u00a7f {0} ({1})
-whoisGamemode=\u00a76 - Modo de Jogo:\u00a7f {0}
-whoisGeoLocation=\u00a76 - Localizacao:\u00a7f {0}
-whoisGod=\u00a76 - Modo Deus:\u00a7f {0}
-whoisHealth=\u00a76 - Saude:\u00a7f {0}/20
-whoisIPAddress=\u00a76 - IP:\u00a7f {0}
-whoisJail=\u00a76 - Prisao:\u00a7f {0}
-whoisLocation=\u00a76 - Localiza\u00e7ao:\u00a7f ({0}, {1}, {2}, {3})
-whoisMoney=\u00a76 - Dinheiro:\u00a7f {0}
-whoisMuted=\u00a76 - Silenciado:\u00a7f {0}
-whoisNick=\u00a76 - Apelido:\u00a7f {0}
-whoisOp=\u00a76 - OP:\u00a7f {0}
-whoisTop=\u00a76 ====== WhoIs:\u00a7f {0} \u00a76======
+whoisBanned=\u00a79 - Banido: {0}
+whoisExp=\u00a79 - Exp: {0} (Level {1})
+whoisGamemode=\u00a79 - Gamemode: {0}
+whoisGeoLocation=\u00a79 - Localiza\u00e7ao: {0}
+whoisGod=\u00a79 - Modo Deus: {0}
+whoisHealth=\u00a79 - Sa\u00fade: {0}/20
+whoisIPAddress=\u00a79 - IP: {0}
+whoisIs={0} e {1}
+whoisJail=\u00a79 - Jail: {0}
+whoisLocation=\u00a79 - Localiza\u00e7ao: ({0}, {1}, {2}, {3})
+whoisMoney=\u00a79 - Dinheiro: {0}
+whoisOP=\u00a79 - OP: {0}
+whoisStatusAvailable=\u00a79 - Estado: Dispon\u00edvel
+whoisStatusAway=\u00a79 - Estado: \u00a7cAway\u00a7f
 worth=\u00a77Pilha de {0} vale \u00a7c{1}\u00a77 ({2} item(s) a {3} cada)
 worthMeta=\u00a77Pilha de {0} com metadados de {1} vale \u00a7c{2}\u00a77 ({3} item(s) a {4} cada)
 worthSet=Definir quanto vale
@@ -440,5 +434,3 @@ year=ano
 years=anos
 youAreHealed=\u00a77Voc\u00ea foi curado.
 youHaveNewMail=\u00a7cVoc\u00ea tem {0} mensagens!\u00a7f Digite \u00a77/mail read\u00a7f para ver seu email.
-hatRemoved=\u00a7eYour hat has been removed.
-banFormat=Banned: {0}

EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java

@@ -3,6 +3,7 @@ package com.earth2me.essentials.xmpp;
 import com.earth2me.essentials.api.IReload;
 import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.utils.Util;
+import com.earth2me.essentials.Util;
 import java.io.File;
 import java.util.*;
 import java.util.logging.Handler;

pom.xml

@@ -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>