Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-02 17:09:58 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' of github.com:essentials/Essentials into 2.9

Browse Source
This commit is contained in:
KHobbits 2013-06-25 16:00:32 +01:00
commit 9edc68bb2b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
View File

@ -66,6 +66,7 @@ public class Commandspawner extends EssentialsCommand
CreatureSpawner spawner = (CreatureSpawner)target.getBlock().getState(); CreatureSpawner spawner = (CreatureSpawner)target.getBlock().getState();
spawner.setSpawnedType(mob.getType()); spawner.setSpawnedType(mob.getType());
spawner.setDelay(delay); spawner.setDelay(delay);
spawner.update();
} }
catch (Throwable ex) catch (Throwable ex)
{ {

20
Essentials/src/messages_fr.properties
View File

@ -447,7 +447,7 @@ teleportingPortal=\u00a77T\u00e9l\u00e9portation via portail.
tempBanned=Banni temporairement du serveur pour {0}. tempBanned=Banni temporairement du serveur pour {0}.
tempbanExempt=\u00a77Vous ne pouvez pas bannir temporairement ce joueur. tempbanExempt=\u00a77Vous ne pouvez pas bannir temporairement ce joueur.
thunder=Vous avez {0} la foudre dans votre monde. thunder=Vous avez {0} la foudre dans votre monde.
thunderDuration=Vous avez {0} la foudre dans le serveur pendant {1} seconde(s). thunderDuration=Vous avez {0} la foudre sur le serveur pendant {1} seconde(s).
timeBeforeHeal=Temps avant le prochain soin : {0} timeBeforeHeal=Temps avant le prochain soin : {0}
timeBeforeTeleport=Temps avant la prochaine t\u00e9l\u00e9portation {0} timeBeforeTeleport=Temps avant la prochaine t\u00e9l\u00e9portation {0}
timeFormat=\u00a73{0}\u00a7f ou \u00a73{1}\u00a7f ou \u00a73{2}\u00a7f timeFormat=\u00a73{0}\u00a7f ou \u00a73{1}\u00a7f ou \u00a73{2}\u00a7f
@ -532,13 +532,13 @@ year=ann\u00e9e
years=ann\u00e9es years=ann\u00e9es
youAreHealed=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9. youAreHealed=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9.
youHaveNewMail=\u00a7cVous avez {0} message(s) ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier. youHaveNewMail=\u00a7cVous avez {0} message(s) ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier.
whoisHunger=\u00a76 - Faim :\u00a7r {0}/20 (+{1} saturation) whoisHunger=\u00a76 - Faim :\u00a7r {0} / 20 (+{1} saturation)
kitDelay=\u00a7m{0}\u00a7r kitDelay=\u00a7m{0}\u00a7r
giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost. giveSpawnFailure=\u00a74Pas assez d''espace dans l''inventaire, \u00a7c{0} \u00a7c{1} \u00a74n''ont pas pu \u00eatre donn\u00e9s.
noKitGroup=\u00a74You do not have access to this kit. noKitGroup=\u00a74Vous n'avez pas acc\u00e8 \u00e0 ce kit.
inventoryClearingFromAll=\u00a76Clearing the inventory of all users... inventoryClearingFromAll=\u00a76Tous les inventaires sont en train d'\u00ea vid\u00e9s...
inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76. inventoryClearingAllItems=\u00a76Tous les items de l''inventaire de {0}\u00a76 ont \u00e9t\u00e9 supprim\u00e9s.
inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76. inventoryClearingAllArmor=\u00a76Tous les items de l''inventaire et l''armure de {0}\u00a76 ont \u00e9t\u00e9 supprim\u00e9s.
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76. inventoryClearingAllStack=\u00a76Tous les\u00a7c {0} \u00a76de l''inventaire de {1}\u00a76 ont \u00e9t\u00e9 supprim\u00e9s.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76. inventoryClearingStack=\u00a7c{0} \u00a7c {1} \u00a76ont \u00e9t\u00e9 supprim\u00e9s de l''inventaire de {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74. inventoryClearFail=\u00a74Le joueur {0} \u00a74n''a pas\u00a7c {1}\u00a7c {2}\u00a74 sur lui.