From 3bb29c830867886bd984aaa961c974abab90ccb3 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sun, 13 May 2012 19:00:49 -0700 Subject: [PATCH] mcMMO's motd now links to the new website rather than the wiki --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/listeners/PlayerListener.java | 2 +- src/main/resources/locale/locale_cs_CZ.properties | 2 +- src/main/resources/locale/locale_da.properties | 2 +- src/main/resources/locale/locale_de.properties | 2 +- src/main/resources/locale/locale_en_US.properties | 2 +- src/main/resources/locale/locale_es.properties | 2 +- src/main/resources/locale/locale_fi.properties | 2 +- src/main/resources/locale/locale_fr.properties | 2 +- src/main/resources/locale/locale_it.properties | 2 +- src/main/resources/locale/locale_ko.properties | 2 +- src/main/resources/locale/locale_lv.properties | 2 +- src/main/resources/locale/locale_nl.properties | 2 +- src/main/resources/locale/locale_no.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 +- src/main/resources/locale/locale_sv.properties | 2 +- 18 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 68692e365..8faf1e3be 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -36,6 +36,7 @@ Version 1.3.07 = Fixed some bypass nodes defaulting true for Ops = Fixed bug with trying to use Chimera Wing while standing on a half-block = Fixed duplication bug when a placed block was mined after a server restart + ! Changed the mcMMO motd to link to the new website rather than the wiki ! Changed bleeding ticks damage to 1 from 2 ! Changed Mining to ignore blocks when the pick is enchanted with Silk Touch ! Changed Super Breaker to be non-functional when used with a Silk Touch enchanted pick diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 4c8e9f845..12983d269 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -166,7 +166,7 @@ public class PlayerListener implements Listener { if (Permissions.getInstance().motd(player) && Config.getInstance().getMOTDEnabled()) { player.sendMessage(LocaleLoader.getString("mcMMO.MOTD", new Object[] {plugin.getDescription().getVersion()})); - player.sendMessage(LocaleLoader.getString("mcMMO.Wiki")); + player.sendMessage(LocaleLoader.getString("mcMMO.Website")); } //THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/src/main/resources/locale/locale_cs_CZ.properties index ee81cec2c..a507c84a1 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/src/main/resources/locale/locale_cs_CZ.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]Tento server pouz\u00edv\u00e1 mcMMO {0}! \n Napis [[YELLOW]] mcMMO.NoInvites=[[RED]]Momentalne nemas zadne pozvanky mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]Pokud nemas pristup k schopnosti, nebude zobrazena. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Spr\u00e1vn\u00e9 pouzit\u00ed je /party pro pripojen\u00ed nebo /party q pro opusten\u00ed diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index 5246b5dd3..1e8102332 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index 2c1110db2..e2f8fe3f4 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Unzureichende Rechte. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 69f6d5594..0ef07c9c2 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -417,7 +417,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don't have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website ##party Commands.Party.InParty=[[GREEN]]Party: {0} diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index 372a721e7..93a9d3bc2 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]Este servidor est\u00e1 utilizando mcMMO {0}! \nEscriba [[YEL mcMMO.NoInvites=[[RED]]No tienes invitaciones en este momento mcMMO.NoPermission=[[DARK_RED]]Permisos insuficientes. mcMMO.NoSkillNote=[[DARK_GRAY]]Si no tienes acceso a una habilidad no ser\u00e1 mostrada aqu\u00ed. -mcMMO.Wiki=[[BLUE]]Wiki de mcMMO - [[GREEN]]http://www.mcmmo.org/wiki/ +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Grupo: {0} Party.Forbidden=[mcMMO] No se permiten grupos en este mundo (Ver permisos) Party.Help.0=[[RED]]El uso correcto es \'/party \' para unirse o \'/party q\' para salir diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index 381d15412..2c9aa63d9 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index f9af0b3a5..5f928e261 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]Ce serveur utilise mcMMO {0} !\nTapez [[YELLOW]]/mcmmo[[BLUE] mcMMO.NoInvites=[[RED]]Vous n\'avez pas \u00e9t\u00e9 invit\u00e9 mcMMO.NoPermission=[[DARK_RED]]Vous n\'avez pas les droits. mcMMO.NoSkillNote=[[DARK_GRAY]]Si vous n\'avez pas les droits pour un talent, il n\'appara\u00eetra pas ici. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - Wiki mcMMO +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Joueurs dans le groupe : {0} Party.Forbidden=[mcMMO] Les groupes ne sont pas permis dans ce monde (voir les permissions) Party.Help.0=[[RED]]L\'usage correct est /party pour rejoindre, et /party q pour quitter diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index ead185982..6bb386409 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Permessi insufficienti. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Compagnia: {0} Party.Forbidden=[mcMMO] I party non sono permessi in questo mondo (Controlla i Permessi) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index 4d408f20b..3b75fe82a 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index ee49504d4..b4cc2f23e 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Nepietiekama at\u013cauja. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index 42a3e2a00..2d4853e75 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Groep: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index 24c2928b8..eccd1ad7d 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index 7674a3b1f..35563edc3 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index b02178e5a..34e053de2 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index a0273130f..36b60ee7e 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]\u0413\u0440\u0443\u043f\u043f\u0430: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]\u0427\u0442\u043e\u0431\u044b \u043f\u0440\u0438\u0441\u043e\u0435\u0434\u0435\u043d\u0438\u0442\u044c\u0441\u044f \u043a \u0433\u0440\u0443\u043f\u043f\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 /party \u0438\u043b\u0438 /party q, \u0447\u0442\u043e\u0431\u044b \u0432\u044b\u0439\u0442\u0438 \u0438\u0437 \u043d\u0435\u0435 diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index c2cabc735..7255fa912 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -358,7 +358,7 @@ mcMMO.MOTD=[[BLUE]]This server is running mcMMO {0}! \n Type [[YELLOW]]/mcmmo[[B mcMMO.NoInvites=[[RED]]You have no invites at this time mcMMO.NoPermission=[[DARK_RED]]Insufficient permissions. mcMMO.NoSkillNote=[[DARK_GRAY]]If you don\'t have access to a skill it will not be shown here. -mcMMO.Wiki=[[GREEN]]http://www.mcmmo.org/wiki/[[BLUE]] - mcMMO Wiki +mcMMO.Website=[[GREEN]]http://forums.mcmmo.info[[BLUE]] - mcMMO Website Commands.Party.InParty=[[GREEN]]Party: {0} Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions) Party.Help.0=[[RED]]Proper usage is /party to join or /party q to quit