Merge remote-tracking branch 'origin/master'

Conflicts: src/itdelatrisu/opsu/states/DownloadsMenu.java
fluddokt · Sep 17, 2017 · 85a6397 · 85a6397
2 parents e388ec6 + 0da1f6d
commit 85a6397
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/itdelatrisu/opsu/downloads/servers/HexideServer.java b/src/itdelatrisu/opsu/downloads/servers/HexideServer.java
@@ -38,8 +38,6 @@
 
 /**
  * Download server: https://osu.hexide.com/
- * <p>
- * <i>This server is offline as of March 2017.</i>
  */
 public class HexideServer extends DownloadServer {
 	/** Server name. */
@@ -149,4 +147,7 @@ public DownloadNode[] resultList(String query, int page, boolean rankedOnly) thr
 
 	@Override
 	public int totalResults() { return totalResults; }
+
+	@Override
+	public boolean disableSSLInDownloads() { return true; }
 }
diff --git a/src/itdelatrisu/opsu/downloads/servers/MengSkyServer.java b/src/itdelatrisu/opsu/downloads/servers/MengSkyServer.java
@@ -40,6 +40,8 @@
 
 /**
  * Download server: http://osu.mengsky.net/
+ * <p>
+ * <i>This server is offline as of September 2017.</i>
  */
 public class MengSkyServer extends DownloadServer {
 	/** Server name. */

diff --git a/src/itdelatrisu/opsu/states/DownloadsMenu.java b/src/itdelatrisu/opsu/states/DownloadsMenu.java
@@ -38,9 +38,9 @@
 import itdelatrisu.opsu.downloads.DownloadNode;
 import itdelatrisu.opsu.downloads.servers.BloodcatServer;
 import itdelatrisu.opsu.downloads.servers.DownloadServer;
-import itdelatrisu.opsu.downloads.servers.RippleServer;
-import itdelatrisu.opsu.downloads.servers.MengSkyServer;
+import itdelatrisu.opsu.downloads.servers.HexideServer;
 import itdelatrisu.opsu.downloads.servers.MnetworkServer;
+import itdelatrisu.opsu.downloads.servers.RippleServer;
 import itdelatrisu.opsu.options.Options;
 import itdelatrisu.opsu.ui.Colors;
 import itdelatrisu.opsu.ui.DropdownMenu;
@@ -96,8 +96,8 @@ public class DownloadsMenu extends BasicGameState {
 	private static final DownloadServer[] SERVERS = {
 		new RippleServer(),
 		new MnetworkServer(),
+		new HexideServer(),
 		new BloodcatServer(),
-		new MengSkyServer(),
 	};
 
 	/** The current list of search results. */