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

Changelog.txt

@@ -163,6 +163,9 @@ Version 2.2.0
     Added API method to check if player parties are size capped
     Added API method to grab the level cap of a skill by its PrimarySkillType ENUM definition
     Added API method to check if a skill was being level capped
+Version 2.1.56
+    Very large update to the zh_CN Chinese language file (thanks Dream_m)
+
 Version 2.1.55
     Fixed a bug that could occur when adding UUIDs to old outdated DBs
 

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -314,24 +314,12 @@ public class mcMMO extends JavaPlugin {
                     metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Standard"));
                 else
                     metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Retro"));
-
-                //Simplified Server Software Tracking
-                if (Bukkit.getServer().getVersion().contains("paper"))
-                    metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "Paper"));
-                else if (Bukkit.getServer().getVersion().contains("spigot") && !Bukkit.getServer().getVersion().contains("paper"))
-                    metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "Spigot"));
-                else if (Bukkit.getServer().getVersion().contains("bukkit"))
-                    metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "CraftBukkit"));
-                else
-                    metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "Unknown"));
             }
         } catch (Throwable t) {
             getLogger().severe("There was an error while enabling mcMMO!");
             t.printStackTrace();
             getLogger().severe("End of error report for mcMMO");
             getLogger().info("Please do not replace the mcMMO jar while the server is running.");
-
-            //getServer().getPluginManager().disablePlugin(this);
         }
 
         //Init Material Maps