mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-11-18 08:35:44 +01:00
Merge branch 'master' of github.com:essentials/Essentials into release
This commit is contained in:
commit
4d0ce90787
@ -669,6 +669,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
|
||||
public void toggleVanished()
|
||||
{
|
||||
final boolean set = !vanished;
|
||||
this.setVanished(set);
|
||||
}
|
||||
|
||||
public boolean checkSignThrottle() {
|
||||
|
@ -44,10 +44,10 @@ public class KeywordReplacer implements IText
|
||||
address = user.getAddress().toString();
|
||||
balance = Double.toString(user.getMoney());
|
||||
mails = Integer.toString(user.getMails().size());
|
||||
world = user.getLocation().getWorld().getName();
|
||||
worldTime12 = DescParseTickFormat.format12(user.getWorld().getTime());
|
||||
worldTime24 = DescParseTickFormat.format24(user.getWorld().getTime());
|
||||
worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld().getFullTime()));
|
||||
world = user.getLocation() == null || user.getLocation().getWorld() == null ? "" : user.getLocation().getWorld().getName();
|
||||
worldTime12 = DescParseTickFormat.format12(user.getWorld() == null ? 0 : user.getWorld().getTime());
|
||||
worldTime24 = DescParseTickFormat.format24(user.getWorld() == null ? 0 : user.getWorld().getTime());
|
||||
worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld() == null ? 0 : user.getWorld().getFullTime()));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -868,6 +868,32 @@ dstoneslab,43,0
|
||||
doublesslab,43,0
|
||||
doubleslab,43,0
|
||||
dslab,43,0
|
||||
smoothstonedoublehalfblock,43,0
|
||||
smoothstonedhalfblock,43,0
|
||||
stonedoublehalfblock,43,0
|
||||
stonedhalfblock,43,0
|
||||
sdoublehalfblock,43,0
|
||||
sdhalfblock,43,0
|
||||
doublesmoothstonehalfblock,43,0
|
||||
dsmoothstonehalfblock,43,0
|
||||
doublestonehalfblock,43,0
|
||||
dstonehalfblock,43,0
|
||||
doubleshalfblock,43,0
|
||||
doublehalfblock,43,0
|
||||
dhalfblock,43,0
|
||||
smoothstonedoublehblock,43,0
|
||||
smoothstonedhblock,43,0
|
||||
stonedoublehblock,43,0
|
||||
stonedhblock,43,0
|
||||
sdoublehblock,43,0
|
||||
sdhblock,43,0
|
||||
doublesmoothstonehblock,43,0
|
||||
dsmoothstonehblock,43,0
|
||||
doublestonehblock,43,0
|
||||
dstonehblock,43,0
|
||||
doubleshblock,43,0
|
||||
doublehblock,43,0
|
||||
dhblock,43,0
|
||||
sandstonedoublestep,43,1
|
||||
sandstonedstep,43,1
|
||||
sstonedoublestep,43,1
|
||||
@ -892,6 +918,118 @@ doublesstoneslab,43,1
|
||||
dsstoneslab,43,1
|
||||
doublessslab,43,1
|
||||
dsslab,43,1
|
||||
sandstonedoublehalfblock,43,1
|
||||
sandstonedhalfblock,43,1
|
||||
sstonedoublehalfblock,43,1
|
||||
sstonedhalfblock,43,1
|
||||
ssdoublehalfblock,43,1
|
||||
ssdhalfblock,43,1
|
||||
doublesandstonehalfblock,43,1
|
||||
dsandstonehalfblock,43,1
|
||||
doublesstonehalfblock,43,1
|
||||
dsstonehalfblock,43,1
|
||||
doublesshalfblock,43,1
|
||||
dsshalfblock,43,1
|
||||
sandstonedoublehblock,43,1
|
||||
sandstonedhblock,43,1
|
||||
sstonedoublehblock,43,1
|
||||
sstonedhblock,43,1
|
||||
ssdoublehblock,43,1
|
||||
ssdhblock,43,1
|
||||
doublesandstonehblock,43,1
|
||||
dsandstonehblock,43,1
|
||||
doublesstonehblock,43,1
|
||||
dsstonehblock,43,1
|
||||
doublesshblock,43,1
|
||||
dsshblock,43,1
|
||||
woodenplankdoublehalfblock,43,2
|
||||
woodenplankdhalfblock,43,2
|
||||
woodplankdoublehalfblock,43,2
|
||||
woodplankdhalfblock,43,2
|
||||
wplankdoublehalfblock,43,2
|
||||
wplankdhalfblock,43,2
|
||||
plankdoublehalfblock,43,2
|
||||
plankdhalfblock,43,2
|
||||
woodenpdoublehalfblock,43,2
|
||||
woodenpdhalfblock,43,2
|
||||
woodpdoublehalfblock,43,2
|
||||
woodpdhalfblock,43,2
|
||||
wpdoublehalfblock,43,2
|
||||
wpdhalfblock,43,2
|
||||
pdoublehalfblock,43,2
|
||||
pdhalfblock,43,2
|
||||
woodendoublehalfblock,43,2
|
||||
woodendhalfblock,43,2
|
||||
wooddoublehalfblock,43,2
|
||||
wooddhalfblock,43,2
|
||||
wdoublehalfblock,43,2
|
||||
wdhalfblock,43,2
|
||||
doublewoodenplankhalfblock,43,2
|
||||
dwoodenplankhalfblock,43,2
|
||||
doublewoodplankhalfblock,43,2
|
||||
dwoodplankhalfblock,43,2
|
||||
doublewplankhalfblock,43,2
|
||||
dwplankhalfblock,43,2
|
||||
doubleplankhalfblock,43,2
|
||||
dplankhalfblock,43,2
|
||||
doublewoodenphalfblock,43,2
|
||||
dwoodenphalfblock,43,2
|
||||
doublewoodphalfblock,43,2
|
||||
dwoodphalfblock,43,2
|
||||
doublewphalfblock,43,2
|
||||
dwphalfblock,43,2
|
||||
doublephalfblock,43,2
|
||||
dphalfblock,43,2
|
||||
doublewoodenhalfblock,43,2
|
||||
dwoodenhalfblock,43,2
|
||||
doublewoodhalfblock,43,2
|
||||
dwoodhalfblock,43,2
|
||||
doublewhalfblock,43,2
|
||||
dwhalfblock,43,2
|
||||
woodenplankdoublehblock,43,2
|
||||
woodenplankdhblock,43,2
|
||||
woodplankdoublehblock,43,2
|
||||
woodplankdhblock,43,2
|
||||
wplankdoublehblock,43,2
|
||||
wplankdhblock,43,2
|
||||
plankdoublehblock,43,2
|
||||
plankdhblock,43,2
|
||||
woodenpdoublehblock,43,2
|
||||
woodenpdhblock,43,2
|
||||
woodpdoublehblock,43,2
|
||||
woodpdhblock,43,2
|
||||
wpdoublehblock,43,2
|
||||
wpdhblock,43,2
|
||||
pdoublehblock,43,2
|
||||
pdhblock,43,2
|
||||
woodendoublehblock,43,2
|
||||
woodendhblock,43,2
|
||||
wooddoublehblock,43,2
|
||||
wooddhblock,43,2
|
||||
wdoublehblock,43,2
|
||||
wdhblock,43,2
|
||||
doublewoodenplankhblock,43,2
|
||||
dwoodenplankhblock,43,2
|
||||
doublewoodplankhblock,43,2
|
||||
dwoodplankhblock,43,2
|
||||
doublewplankhblock,43,2
|
||||
dwplankhblock,43,2
|
||||
doubleplankhblock,43,2
|
||||
dplankhblock,43,2
|
||||
doublewoodenphblock,43,2
|
||||
dwoodenphblock,43,2
|
||||
doublewoodphblock,43,2
|
||||
dwoodphblock,43,2
|
||||
doublewphblock,43,2
|
||||
dwphblock,43,2
|
||||
doublewoodenhblock,43,2
|
||||
dwoodenhblock,43,2
|
||||
doublewoodhblock,43,2
|
||||
dwoodhblock,43,2
|
||||
doublewhblock,43,2
|
||||
dwhblock,43,2
|
||||
doublephblock,43,2
|
||||
dphblock,43,2
|
||||
woodenplankdoublestep,43,2
|
||||
woodenplankdstep,43,2
|
||||
woodplankdoublestep,43,2
|
||||
@ -1012,18 +1150,166 @@ doublecstoneslab,43,3
|
||||
dcstoneslab,43,3
|
||||
doublecsslab,43,3
|
||||
dcsslab,43,3
|
||||
cobblestonedoublehalfblock,43,3
|
||||
cobblestonedhalfblock,43,3
|
||||
cobbledoublehalfblock,43,3
|
||||
cobbledhalfblock,43,3
|
||||
cstonedoublehalfblock,43,3
|
||||
cstonedhalfblock,43,3
|
||||
csdoublehalfblock,43,3
|
||||
csdhalfblock,43,3
|
||||
doublecobblestonehalfblock,43,3
|
||||
dcobblestonehalfblock,43,3
|
||||
doublecobblehalfblock,43,3
|
||||
dcobblehalfblock,43,3
|
||||
doublecstonehalfblock,43,3
|
||||
dcstonehalfblock,43,3
|
||||
doublecshalfblock,43,3
|
||||
dcshalfblock,43,3
|
||||
cobblestonedoublehblock,43,3
|
||||
cobblestonedhblock,43,3
|
||||
cobbledoublehblock,43,3
|
||||
cobbledhblock,43,3
|
||||
cstonedoublehblock,43,3
|
||||
cstonedhblock,43,3
|
||||
csdoublehblock,43,3
|
||||
csdhblock,43,3
|
||||
doublecobblestonehblock,43,3
|
||||
dcobblestonehblock,43,3
|
||||
doublecobblehblock,43,3
|
||||
dcobblehblock,43,3
|
||||
doublecstonehblock,43,3
|
||||
dcstonehblock,43,3
|
||||
doublecshblock,43,3
|
||||
dcshblock,43,3
|
||||
brickblockdoublestep,43,4
|
||||
brickblockdstep,43,4
|
||||
brickbdoublestep,43,4
|
||||
brickbdstep,43,4
|
||||
brickdoublestep,43,4
|
||||
brickdstep,43,4
|
||||
bdoublestep,43,4
|
||||
bdstep,43,4
|
||||
brickblockdoubleslab,43,4
|
||||
brickblockdslab,43,4
|
||||
brickbdoubleslab,43,4
|
||||
brickbdslab,43,4
|
||||
brickdoubleslab,43,4
|
||||
brickdslab,43,4
|
||||
bdoubleslab,43,4
|
||||
bdslab,43,4
|
||||
doublebrickblockstep,43,4
|
||||
dbrickblockstep,43,4
|
||||
doublebrickbstep,43,4
|
||||
dbrickbstep,43,4
|
||||
doublebrickstep,43,4
|
||||
dbrickstep,43,4
|
||||
doublebstep,43,4
|
||||
dbstep,43,4
|
||||
doublebrickblockslab,43,4
|
||||
dbrickblockslab,43,4
|
||||
doublebrickbslab,43,4
|
||||
dbrickbslab,43,4
|
||||
doublebrickslab,43,4
|
||||
dbrickslab,43,4
|
||||
doublebslab,43,4
|
||||
dbslab,43,4
|
||||
brickblockdoublehalfblock,43,4
|
||||
brickblockdhalfblock,43,4
|
||||
brickbdoublehalfblock,43,4
|
||||
brickbdhalfblock,43,4
|
||||
brickdoublehalfblock,43,4
|
||||
brickdhalfblock,43,4
|
||||
bdoublehalfblock,43,4
|
||||
bdhalfblock,43,4
|
||||
brickblockdoublehblock,43,4
|
||||
brickblockdhblock,43,4
|
||||
brickbdoublehblock,43,4
|
||||
brickbdhblock,43,4
|
||||
brickdoublehblock,43,4
|
||||
brickdhblock,43,4
|
||||
bdoublehblock,43,4
|
||||
bdhblock,43,4
|
||||
doublebrickblockhalfblock,43,4
|
||||
dbrickblockhalfblock,43,4
|
||||
doublebrickbhalfblock,43,4
|
||||
dbrickbhalfblock,43,4
|
||||
doublebrickhalfblock,43,4
|
||||
dbrickhalfblock,43,4
|
||||
doublebhalfblock,43,4
|
||||
dbhalfblock,43,4
|
||||
doublebrickblockhblock,43,4
|
||||
dbrickblockhblock,43,4
|
||||
doublebrickbhblock,43,4
|
||||
dbrickbhblock,43,4
|
||||
doublebrickhblock,43,4
|
||||
dbrickhblock,43,4
|
||||
doublebhblock,43,4
|
||||
dbhblock,43,4
|
||||
stonebrickdoublestep,43,5
|
||||
stonebrickdstep,43,5
|
||||
stonebdoublestep,43,5
|
||||
stonebdstep,43,5
|
||||
sbrickdoublestep,43,5
|
||||
sbrickdstep,43,5
|
||||
sbdoublestep,43,5
|
||||
sbdstep,43,5
|
||||
stonebrickdoubleslab,43,5
|
||||
stonebrickdslab,43,5
|
||||
stonebdoubleslab,43,5
|
||||
stonebdslab,43,5
|
||||
sbrickdoubleslab,43,5
|
||||
sbrickdslab,43,5
|
||||
sbdoubleslab,43,5
|
||||
sbdslab,43,5
|
||||
doublestonebrickstep,43,5
|
||||
dstonebrickstep,43,5
|
||||
doublestonebstep,43,5
|
||||
dstonebstep,43,5
|
||||
doublesbrickstep,43,5
|
||||
dsbrickstep,43,5
|
||||
doublesbstep,43,5
|
||||
dsbstep,43,5
|
||||
doublestonebrickslab,43,5
|
||||
dstonebrickslab,43,5
|
||||
doublestonebslab,43,5
|
||||
dstonebslab,43,5
|
||||
doublesbrickslab,43,5
|
||||
dsbrickdslab,43,5
|
||||
doublesbslab,43,5
|
||||
dsbslab,43,5
|
||||
stonebrickdoublehalfblock,43,5
|
||||
stonebrickdhalfblock,43,5
|
||||
stonebdoublehalfblock,43,5
|
||||
stonebdhalfblock,43,5
|
||||
sbrickdoublehalfblock,43,5
|
||||
sbrickdhalfblock,43,5
|
||||
sbdoublehalfblock,43,5
|
||||
sbdhalfblock,43,5
|
||||
stonebrickdoublehblock,43,5
|
||||
stonebrickdhblock,43,5
|
||||
stonebdoublehblock,43,5
|
||||
stonebdhblock,43,5
|
||||
sbrickdoublehblock,43,5
|
||||
sbrickdhblock,43,5
|
||||
sbdoublehblock,43,5
|
||||
sbdhblock,43,5
|
||||
doublestonebrickhalfblock,43,5
|
||||
dstonebrickhalfblock,43,5
|
||||
doublestonebhalfblock,43,5
|
||||
dstonebhalfblock,43,5
|
||||
doublesbrickhalfblock,43,5
|
||||
dsbrickhalfblock,43,5
|
||||
doublesbhalfblock,43,5
|
||||
dsbhalfblock,43,5
|
||||
doublestonebrickhblock,43,5
|
||||
dstonebrickhblock,43,5
|
||||
doublestonebhblock,43,5
|
||||
dstonebhblock,43,5
|
||||
doublesbrickhblock,43,5
|
||||
dsbrickdhblock,43,5
|
||||
doublesbhblock,43,5
|
||||
dsbhblock,43,5
|
||||
adminslab,43,6
|
||||
magicslab,43,6
|
||||
adslab,43,6
|
||||
@ -1035,12 +1321,26 @@ smoothstoneslab,44,0
|
||||
stoneslab,44,0
|
||||
sslab,44,0
|
||||
slab,44,0
|
||||
smoothstonehalfblock,44,0
|
||||
stonehalfblock,44,0
|
||||
shalfblock,44,0
|
||||
halfblock,44,0
|
||||
smoothstonehblock,44,0
|
||||
stonehblock,44,0
|
||||
shblock,44,0
|
||||
hblock,44,0
|
||||
sanddstonestep,44,1
|
||||
sstonestep,44,1
|
||||
ssstep,44,1
|
||||
sanddstoneslab,44,1
|
||||
sstoneslab,44,1
|
||||
ssslab,44,1
|
||||
sanddstonehalfblock,44,1
|
||||
sstonehalfblock,44,1
|
||||
sshalfblock,44,1
|
||||
sanddstonehblock,44,1
|
||||
sstonehblock,44,1
|
||||
sshblock,44,1
|
||||
woodenplankstep,44,2
|
||||
woodplankstep,44,2
|
||||
wplankstep,44,2
|
||||
@ -1062,6 +1362,27 @@ woodenslab,44,2
|
||||
woodslab,44,2
|
||||
wslab,44,2
|
||||
pslab,44,2
|
||||
woodenplankhalfblock,44,2
|
||||
woodplankhalfblock,44,2
|
||||
wplankhalfblock,44,2
|
||||
plankhalfblock,44,2
|
||||
woodenphalfblock,44,2
|
||||
woodphalfblock,44,2
|
||||
wphalfblock,44,2
|
||||
woodenhalfblock,44,2
|
||||
woodhalfblock,44,2
|
||||
whalfblock,44,2
|
||||
phalfblock,44,2
|
||||
woodplankhblock,44,2
|
||||
wplankhblock,44,2
|
||||
plankhblock,44,2
|
||||
woodenphblock,44,2
|
||||
woodphblock,44,2
|
||||
wphblock,44,2
|
||||
woodenhblock,44,2
|
||||
woodhblock,44,2
|
||||
whblock,44,2
|
||||
phblock,44,2
|
||||
cobblestonestep,44,3
|
||||
cobblestep,44,3
|
||||
cstonestep,44,3
|
||||
@ -1070,16 +1391,46 @@ cobblestoneslab,44,3
|
||||
cobbleslab,44,3
|
||||
cstoneslab,44,3
|
||||
csslab,44,3
|
||||
brickstep,44,4
|
||||
cobblestonehalfblock,44,3
|
||||
cobblehalfblock,44,3
|
||||
cstonehalfblock,44,3
|
||||
cshalfblock,44,3
|
||||
cobblestonehblock,44,3
|
||||
cobblehblock,44,3
|
||||
cstonehblock,44,3
|
||||
cshblock,44,3
|
||||
brickblockstep,44,4
|
||||
brickbstep,44,4
|
||||
brickstep,44,4
|
||||
bstep,44,4
|
||||
brickslab,44,4
|
||||
brickblockslab,44,4
|
||||
brickbslab,44,4
|
||||
brickslab,44,4
|
||||
bslab,44,4
|
||||
brickblockhalfblock,44,4
|
||||
brickbhalfblock,44,4
|
||||
brickhalfblock,44,4
|
||||
bhalfblock,44,4
|
||||
brickblockhblock,44,4
|
||||
brickbhblock,44,4
|
||||
brickhblock,44,4
|
||||
bhblock,44,4
|
||||
stonebrickstep,44,5
|
||||
stonebstep,44,5
|
||||
sbrickstep,44,5
|
||||
sbstep,44,5
|
||||
stonebrickslab,44,5
|
||||
stonebslab,44,5
|
||||
sbrickslab,44,5
|
||||
sbslab,44,5
|
||||
stonebrickhalfblock,44,5
|
||||
stonebhalfblock,44,5
|
||||
sbrickhalfblock,44,5
|
||||
sbhalfblock,44,5
|
||||
stonebrickhblock,44,5
|
||||
stonebhblock,44,5
|
||||
sbrickhblock,44,5
|
||||
sbhblock,44,5
|
||||
brickblock,45,0
|
||||
blockbrick,45,0
|
||||
bblock,45,0
|
||||
|
|
@ -1,4 +1,4 @@
|
||||
# version: TeamCity
|
||||
#version: TeamCity
|
||||
# Single quotes have to be doubled: ''
|
||||
# Translations start here
|
||||
# by:
|
||||
|
Loading…
Reference in New Issue
Block a user