From fb35e7dd5d343691897982c51a06a480f1679767 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 24 Feb 2012 07:54:17 -0800 Subject: [PATCH] Updating changelog. Fixing Herbalism command display. --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java | 2 +- src/main/resources/locale/locale_de.properties | 2 +- src/main/resources/locale/locale_en_us.properties | 2 +- src/main/resources/locale/locale_es_es.properties | 2 +- src/main/resources/locale/locale_fi.properties | 2 +- src/main/resources/locale/locale_fr.properties | 2 +- src/main/resources/locale/locale_nl.properties | 2 +- src/main/resources/locale/locale_pl.properties | 2 +- src/main/resources/locale/locale_pt_br.properties | 2 +- src/main/resources/locale/locale_ru.properties | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 211719163..9ea3cd6e8 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -31,6 +31,7 @@ Version 1.3.00-dev = Prettied up new config files = Various skill function optimizations ! Changed mcMMO user information to be stored for 2 minutes after log out to reduce lag on rejoins + ! Changed Food+ to be named Farmer's Diet in Herbalism ! Changed default values of Woodcutting XP tables ! Changed 'Pine' to be renamed 'Oak' in Woodcutting XP tables ! Changed the name of Unarmed Apprentice/Mastery to Iron Arm Style diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java index 96991fe64..5d5f3f714 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java @@ -59,7 +59,7 @@ public class mcEntityListener implements Listener public mcEntityListener(final mcMMO plugin) { this.plugin = plugin; } - + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEntityDamage(EntityDamageEvent event) { diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index f66030825..cd506a176 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -186,7 +186,7 @@ m.HerbalismGreenTerraLength=[[YELLOW]]Gruene Welt Dauer: [[GREEN]]{0}s m.HerbalismGreenThumbChance=[[YELLOW]]Gruener Daumen Chance: [[GREEN]]{0}% m.HerbalismGreenThumbStage=[[YELLOW]]Gruener Daumen Stufe: [[GREEN]] Getreide waechst auf Stufe {0} m.HerbalismDoubleDropChance=[[YELLOW]]Doppelte Drop Chance: [[GREEN]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=Graben (Excavation) m.XPGainExcavation=[[YELLOW]]Graben und Finden von Schaetzen m.EffectsExcavation1_0=[[YELLOW]]Giga Bohrer (Faehigkeit) diff --git a/src/main/resources/locale/locale_en_us.properties b/src/main/resources/locale/locale_en_us.properties index ff1f0c0e6..93010cac4 100644 --- a/src/main/resources/locale/locale_en_us.properties +++ b/src/main/resources/locale/locale_en_us.properties @@ -188,7 +188,7 @@ m.HerbalismGreenTerraLength=[[RED]]Green Terra Length: [[YELLOW]]{0}s m.HerbalismGreenThumbChance=[[RED]]Green Thumb Chance: [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Green Thumb Stage: [[YELLOW]] Wheat grows in stage {0} m.HerbalismDoubleDropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=EXCAVATION m.XPGainExcavation=Digging and finding treasures m.EffectsExcavation1_0=Giga Drill Breaker (ABILITY) diff --git a/src/main/resources/locale/locale_es_es.properties b/src/main/resources/locale/locale_es_es.properties index 91afd9a0b..b7b460879 100644 --- a/src/main/resources/locale/locale_es_es.properties +++ b/src/main/resources/locale/locale_es_es.properties @@ -186,7 +186,7 @@ m.HerbalismGreenTerraLength=[[RED]]Duracion de Tierra verde: [[YELLOW]]{0}s m.HerbalismGreenThumbChance=[[RED]]Posibilidad de Dedos verdes: [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Etapa de Dedos verdes: [[YELLOW]] El Trigo crece en la etapa {0} m.HerbalismDoubleDropChance=[[RED]]Posibilidad de Doble beneficio: [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=EXCAVACION m.XPGainExcavation=Excavar y encontrar tesoros m.EffectsExcavation1_0=Ultra perforador (HABILIDAD) diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index aaa19aa89..791f98ee6 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -186,7 +186,7 @@ m.HerbalismGreenTerraLength=[[RED]]Vihermaan kesto: [[YELLOW]]{0}s m.HerbalismGreenThumbChance=[[RED]]Viherpeukalon todennäköisyys: [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Viherpeukalon vaihe: [[YELLOW]] Vehnä kasvaa {0}:ssa vaiheessa m.HerbalismDoubleDropChance=[[RED]]Tuplasaaliin todennäköisyys: [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=KAIVANTO m.XPGainExcavation=Kaivamalla ja löytämällä aarteita m.EffectsExcavation1_0=Giga Drill Breaker (TAITO) diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index db3a56008..bdc18b677 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -186,7 +186,7 @@ m.HerbalismGreenTerraLength=[[RED]]Dur m.HerbalismGreenThumbChance=[[RED]]Cances d'obtenir la main verte : [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Main verte par niveaux : [[YELLOW]] Wheat grows in stage {0} m.HerbalismDoubleDropChance=[[RED]]Chances du Double Butin : [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=EXCAVATION m.XPGainExcavation=Creuser et trouver des trésors m.EffectsExcavation1_0=Super broyeur (capacité spéciale) diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index 671b37e3c..96c5bf363 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -192,7 +192,7 @@ m.HerbalismGreenTerraLength=[[RED]]Groene Aarde lengte: [[YELLOW]]{0}s m.HerbalismGreenThumbChance=[[RED]]Kans op Groene vingers: [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Groene vingers periode: [[YELLOW]] Wheat groeit in periode {0} m.HerbalismDoubleDropChance=[[RED]]Kans op Dubbele Drop: [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=UITGRAVING m.XPGainExcavation=Graven m.EffectsExcavation1_0=Giga Drilboor (ABILITY) diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index eb2746a16..08789bb04 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -186,7 +186,7 @@ m.HerbalismGreenTerraLength=[[RED]]Czas trwania zielonej ziemi: [[YELLOW]]{0} se m.HerbalismGreenThumbChance=[[RED]]Szansa na wprawne rece: [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Poziom wprawnych rak: [[YELLOW]] Zboze rosnie na poziomie {0} m.HerbalismDoubleDropChance=[[RED]]Szansa na udane zbiory: [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=WYKOPALISKA m.XPGainExcavation=Kopanie i odnajdywanie skarbow. m.EffectsExcavation1_0=Super Szybka Saperka (UMIEJETNOSC) diff --git a/src/main/resources/locale/locale_pt_br.properties b/src/main/resources/locale/locale_pt_br.properties index 8b9616b4c..140427a24 100644 --- a/src/main/resources/locale/locale_pt_br.properties +++ b/src/main/resources/locale/locale_pt_br.properties @@ -193,7 +193,7 @@ m.HerbalismGreenTerraLength=[[RED]]Dura m.HerbalismGreenThumbChance=[[RED]]Chance do Dedos Verdes: [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Nível do Dedos Verdes: [[YELLOW]] Trigo Cresce no Nível {0} m.HerbalismDoubleDropChance=[[RED]]Chance de Drop x2: [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=ESCAVAÇAO m.XPGainExcavation=Cavando e encontrando tesouros m.EffectsExcavation1_0=Super Broca (HABILIDADE ESPECIAL) diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 45b65be69..e18f978a3 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -187,7 +187,7 @@ m.HerbalismGreenTerraLength=[[RED]] m.HerbalismGreenThumbChance=[[RED]]Øàíñ "Çåëåíîãî ôåðìåðà": [[YELLOW]]{0}% m.HerbalismGreenThumbStage=[[RED]]Óðîâåíü "Çåëåíîãî ôåðìåðà": [[YELLOW]] Ïùåíèöà ðàñòåò ïî-óðîâíåâî {0} m.HerbalismDoubleDropChance=[[RED]]Øàíñ äâîéíîãî äðîïà: [[YELLOW]]{0}% -m.HerbalismFoodPlus=[[RED]]Farmer's Diet (Rank{0}) +m.HerbalismFoodPlus=[[RED]]Farmers Diet: [[YELLOW]]Rank {0} m.SkillExcavation=Ðàñêîïêà m.XPGainExcavation=Ðàñêàïûâàòü è èñêàòü ñîêðîâèùà m.EffectsExcavation1_0=Ìåãà äðåëü(ñïîñîáíîñòü)