diff --git a/.gitignore b/.gitignore index d35b250f77b..7ecdf2fd4b8 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ Utils/*implemented.txt # build tools mage-bundle.zip .env +.classpath diff --git a/Mage.Client/sounds/GameCanStart.wav b/Mage.Client/sounds/GameCanStart.wav index 68d63892562..672e69289c1 100644 Binary files a/Mage.Client/sounds/GameCanStart.wav and b/Mage.Client/sounds/GameCanStart.wav differ diff --git a/Mage.Client/sounds/OnGameStart.wav b/Mage.Client/sounds/OnGameStart.wav index 08d76fefdb0..6596ef9574f 100644 Binary files a/Mage.Client/sounds/OnGameStart.wav and b/Mage.Client/sounds/OnGameStart.wav differ diff --git a/Mage.Client/sounds/OnPlayerJoined.wav b/Mage.Client/sounds/OnPlayerJoined.wav index 98a94af7515..4a9be75f543 100644 Binary files a/Mage.Client/sounds/OnPlayerJoined.wav and b/Mage.Client/sounds/OnPlayerJoined.wav differ diff --git a/Mage.Client/sounds/OnPlayerLeft.wav b/Mage.Client/sounds/OnPlayerLeft.wav index 13c6a54aa3b..f2ada3a645b 100644 Binary files a/Mage.Client/sounds/OnPlayerLeft.wav and b/Mage.Client/sounds/OnPlayerLeft.wav differ diff --git a/Mage.Client/sounds/OnPlayerLost.wav b/Mage.Client/sounds/OnPlayerLost.wav index 4960cf90d4d..94d5904efa7 100644 Binary files a/Mage.Client/sounds/OnPlayerLost.wav and b/Mage.Client/sounds/OnPlayerLost.wav differ diff --git a/Mage.Client/sounds/OnPlayerQuit.wav b/Mage.Client/sounds/OnPlayerQuit.wav index 4d97f17e4fe..b4a4057c18b 100644 Binary files a/Mage.Client/sounds/OnPlayerQuit.wav and b/Mage.Client/sounds/OnPlayerQuit.wav differ diff --git a/Mage.Client/sounds/OnPlayerQuitTournament.wav b/Mage.Client/sounds/OnPlayerQuitTournament.wav index 8857e7980f7..586122839d3 100644 Binary files a/Mage.Client/sounds/OnPlayerQuitTournament.wav and b/Mage.Client/sounds/OnPlayerQuitTournament.wav differ diff --git a/Mage.Client/sounds/OnPlayerWon.wav b/Mage.Client/sounds/OnPlayerWon.wav index 91f00881dde..8456a90c7d1 100644 Binary files a/Mage.Client/sounds/OnPlayerWon.wav and b/Mage.Client/sounds/OnPlayerWon.wav differ diff --git a/Mage.Client/sounds/OnTournamentStart.wav b/Mage.Client/sounds/OnTournamentStart.wav index 94df53fcd9f..5787eb7183e 100644 Binary files a/Mage.Client/sounds/OnTournamentStart.wav and b/Mage.Client/sounds/OnTournamentStart.wav differ diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 6cc1534ca97..c69fe489ddd 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -88,7 +88,7 @@ import java.util.stream.Collectors; */ public class MageFrame extends javax.swing.JFrame implements MageClient { - private static final String TITLE_NAME = "XMage"; + private static final String TITLE_NAME = "XMage (Foul Magics)"; private static final Logger LOGGER = Logger.getLogger(MageFrame.class); private static final String LITE_MODE_ARG = "-lite"; diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java index d445663c0c5..d60bede3765 100644 --- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java +++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGeneratorDialog.java @@ -135,7 +135,7 @@ public class DeckGeneratorDialog { c.ipadx = 30; c.insets = new Insets(5, 10, 0, 10); c.weightx = 0.90; - cbDeckSize = new JComboBox<>(new String[]{"40", "60"}); + cbDeckSize = new JComboBox<>(new String[]{"40", "60", "100"}); cbDeckSize.setSelectedIndex(0); cbDeckSize.setAlignmentX(Component.LEFT_ALIGNMENT); mainPanel.add(cbDeckSize, c); diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java index eda14229c60..2cd7cb002c3 100644 --- a/Mage.Server/src/main/java/mage/server/Session.java +++ b/Mage.Server/src/main/java/mage/server/Session.java @@ -287,7 +287,6 @@ public class Session { body.addProperty("accountName", userName); String json = body.toString(); - System.out.println(json); URL url = new URL(managerFactory.configSettings().getAuthUrl()); HttpURLConnection conn = (HttpURLConnection) url.openConnection();