Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO into endgame

.gitignore

@@ -55,3 +55,4 @@
 
 # Atlassian Stuff
 /atlassian-ide-plugin.xml
+/nulllocale_override.properties

Changelog.txt

@@ -50,6 +50,7 @@ Version 2.2.000
     This power level command gives you a view of all your current masteries, it also provides a summary of your power level.
 
 Version 2.1.219
+    Fixed wiki url being incorrect in commands
     Added support for various new things from Minecraft 1.20
     Fixed double drop issue with Beetroots
     Added 'Camel' to taming experience in experience.yml

src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java

@@ -4,7 +4,7 @@ public class McMMOUrl {
     public static final String urlWebsite   = "https://www.mcmmo.org";
     public static final String urlDiscord   = "https://discord.gg/bJ7pFS9";
     public static final String urlPatreon   = "https://www.patreon.com/nossr50";
-    public static final String urlWiki      = "https://www.mcmmo.org/wiki/";
+    public static final String urlWiki      = "https://wiki.mcmmo.org/";
     public static final String urlSpigot    = "https://spigot.mcmmo.org";
     public static final String urlTranslate = "https://translate.mcmmo.org/";
 

src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java

@@ -69,7 +69,7 @@ public class TextComponentFactory {
         TextComponent.Builder wikiLinkComponent = Component.text().content(LocaleLoader.getString("Overhaul.mcMMO.MmoInfo.Wiki"));
         wikiLinkComponent.decoration(TextDecoration.UNDERLINED, true);
 
-        String wikiUrl = "https://mcmmo.org/wiki/"+subskillformatted;
+        String wikiUrl = "https://wiki.mcmmo.org/"+subskillformatted;
 
         wikiLinkComponent.clickEvent(ClickEvent.openUrl(wikiUrl));