Merge branch 'development' into feature/expand-progresslistener

src/main/java/org/parabot/Landing.java

@@ -15,10 +15,10 @@ import java.io.File;
 import java.io.IOException;
 
 /**
- * Parabot v2.6
+ * Parabot v2.7
  *
  * @author Everel, JKetelaar, Matt, Dane
- * @version 2.6
+ * @version 2.7
  * @see <a href="http://www.parabot.org">Homepage</a>
  */
 public final class Landing {

src/main/java/org/parabot/core/asm/RedirectClassAdapter.java

@@ -16,8 +16,12 @@ import java.util.Map;
 
 public class RedirectClassAdapter extends ClassVisitor implements Opcodes {
 
+    public static Map<String, Class<?>> getRedirects() {
+        return redirects;
+    }
+
     private static final Map<String, Class<?>> redirects = new HashMap<String, Class<?>>();
-    private static PrintStream str_out, class_out;
+    private static       PrintStream           str_out, class_out;
 
     static {
         redirects.put("java/awt/Toolkit", ToolkitRedirect.class);

src/main/java/org/parabot/core/desc/ServerDescription.java

@@ -39,7 +39,10 @@ public class ServerDescription implements Comparable<ServerDescription> {
     @Override
     public int compareTo(ServerDescription o) {
         if (this.getServerName().equalsIgnoreCase(o.getServerName())) {
-            return 1;
+            if (getAuthor().equals(o.getAuthor())) {
+                return Double.compare(o.getRevision(), getRevision());
+            }
+            return getAuthor().compareTo(o.getAuthor());
         }
         return this.getServerName().compareTo(o.getServerName());
     }