External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Network_Upgrade

Browse source 
Conflicts:
	Mage.Client/src/main/java/mage/client/MageFrame.java
	Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
	Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
	Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
	Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
	Mage.Common/src/mage/interfaces/MageServer.java
	Mage.Common/src/mage/remote/Connection.java
	Mage.Common/src/mage/remote/SessionImpl.java
	Mage.Server/src/main/java/mage/server/MageServerImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/SessionManager.java
	Mage.Server/src/main/java/mage/server/TableController.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
	Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
This commit is contained in:
betasteward 2015-06-30 23:13:29 -04:00
commit 88e30ee6e1
1364 changed files with 51978 additions and 7733 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java
View file

@ -487,7 +487,7 @@ public class ConnectDialog extends JDialog {
private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
BufferedReader in = null;
try {
URL serverListURL = new URL("http://XMage.info/files/server-list.txt");
URL serverListURL = new URL("http://XMage.de/files/server-list.txt");
in = new BufferedReader(new InputStreamReader(serverListURL.openStream()));
List<String> servers = new ArrayList<>();