From 1fe89cda00b1e1d2047c6b7186da6ffdcb4aaae5 Mon Sep 17 00:00:00 2001 From: Exslims Date: Sat, 10 Jun 2017 21:21:21 +0400 Subject: [PATCH] added 3.0 beta support --- .../java/com/mercury/platform/core/MercuryConstants.java | 2 +- .../java/com/mercury/platform/shared/MessageParser.java | 6 +++--- .../mercury/platform/ui/frame/titled/TestCasesFrame.java | 2 ++ app-ui/src/main/resources/notes/patch/patch-notes.json | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java index 93e1aa94..58ec95c6 100644 --- a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java +++ b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java @@ -1,7 +1,7 @@ package com.mercury.platform.core; public class MercuryConstants { - public static final String APP_VERSION = "1.0.1.3"; + public static final String APP_VERSION = "1.0.1.4"; public static final String SERVER_HOST = "exslims.ddns.net"; public static final int PORT = 5555; } diff --git a/app-core/src/main/java/com/mercury/platform/shared/MessageParser.java b/app-core/src/main/java/com/mercury/platform/shared/MessageParser.java index fa47eb48..1b0ff2ac 100644 --- a/app-core/src/main/java/com/mercury/platform/shared/MessageParser.java +++ b/app-core/src/main/java/com/mercury/platform/shared/MessageParser.java @@ -8,9 +8,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class MessageParser { - private final static String poeTradePattern = "^(.*\\s)?(.+):.+ to buy your (.+) listed for (\\d+(\\.\\d+)?)? (.+) in (Hardcore Legacy|Standard|Hardcore|Legacy)\\.?\\s*(\\(stash tab \"(.*)\"; position: left (\\d+), top (\\d+)\\))?(.*)$"; - private final static String poeCurrencyPattern = "^(.*\\s)?(.+):.+ to buy your (\\d+(\\.\\d+)?)? (.+) for my (\\d+(\\.\\d+)?)? (.+) in (Hardcore Legacy|Standard|Hardcore|Legacy)\\.?\\s*(.*)$"; - private final static String poeTradeNoBuyout = "^(.*\\s)?(.+):.+ to buy your (.+) in (Hardcore Legacy|Standard|Hardcore|Legacy)\\.?\\s*(\\(stash tab \"(.*)\"; position: left (\\d+), top (\\d+)\\))?\\s*(.*)$"; + private final static String poeTradePattern = "^(.*\\s)?(.+):.+ to buy your (.+) listed for (\\d+(\\.\\d+)?)? (.+) in (Hardcore Legacy|Beta Standard|Standard|Beta Hardcore|Hardcore|Legacy)\\.?\\s*(\\(stash tab \"(.*)\"; position: left (\\d+), top (\\d+)\\))?(.*)$"; + private final static String poeCurrencyPattern = "^(.*\\s)?(.+):.+ to buy your (\\d+(\\.\\d+)?)? (.+) for my (\\d+(\\.\\d+)?)? (.+) in (Hardcore Legacy|Beta Standard|Standard|Beta Hardcore|Hardcore|Legacy)\\.?\\s*(.*)$"; + private final static String poeTradeNoBuyout = "^(.*\\s)?(.+):.+ to buy your (.+) in (Hardcore Legacy|Beta Standard|Standard|Beta Hardcore|Hardcore|Legacy)\\.?\\s*(\\(stash tab \"(.*)\"; position: left (\\d+), top (\\d+)\\))?\\s*(.*)$"; private Pattern poeTradeItemPattern; private Pattern poeTradeCurrencyPattern; diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestCasesFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestCasesFrame.java index dda8a82e..34e712d1 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestCasesFrame.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestCasesFrame.java @@ -130,6 +130,8 @@ public TestCasesFrame() { leagues.add("Hardcore Legacy"); leagues.add("Legacy"); leagues.add("Hardcore"); + leagues.add("Beta Standard"); + leagues.add("Beta Hardcore"); } @Override diff --git a/app-ui/src/main/resources/notes/patch/patch-notes.json b/app-ui/src/main/resources/notes/patch/patch-notes.json index c548d45f..ec0b69e3 100644 --- a/app-ui/src/main/resources/notes/patch/patch-notes.json +++ b/app-ui/src/main/resources/notes/patch/patch-notes.json @@ -1,9 +1,9 @@ { - "version":"1.0.1.3", + "version":"1.0.1.4", "notes":[ { "title" : "Update", - "text" : "- Added sound volume sliders.\n- Updated Chat Scanner with requested features.\n- Updated Support tab.\n- Fixed the bug with notifications not displaying after some time.\n- Fixed the bug related to having too many notificatons.\n\nIf you love MercuryTrade so much it has become your favourite application to play the game - show your appreciation by supporting it!\nIf you have troubles updating please download directly from github. Thanks!", + "text" : "- MercuryTrade now has 3.0 Beta support!\nThank you for staying with us, closer to Fall of Oriath release MT will have a huge update with unique features, stay tuned!", "image" : "", "layout" : "VERTICAL" }