Release 1.4.0

Author: Morph21

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.3.9";
+    public static final String APP_VERSION = "1.4.0";
     public static final String SERVER_HOST = "exslims.ddns.net";
     public static final int PORT = 5555;
 }

app-ui/src/main/java/com/mercury/platform/ui/components/ComponentsFactory.java

@@ -97,9 +97,9 @@ private void loadFonts() {
             futures.add(executor.submit(krCallable));
             futures.add(executor.submit(baseCallable));
 
-            Font base = futures.get(0).get();
-            CJK_FONT = futures.get(1).get();
-            KR_FONT = futures.get(2).get();
+            Font base = futures.get(2).get();
+            CJK_FONT = futures.get(0).get();
+            KR_FONT = futures.get(1).get();
 
 
 //            Font base = Font.createFont(Font.TRUETYPE_FONT, getClass().getClassLoader().getResourceAsStream("font/NotoSans-VariableFont.ttf"));

app-ui/src/main/resources/notes/patch/patch-notes-new.json

@@ -1,4 +1,12 @@
 [
+  {
+    "version": "1.4.0",
+    "fix": [
+      {
+        "changed": "Fixed loading fonts for chinese and korean letters"
+      }
+    ]
+  },
   {
     "version": "1.3.9",
     "features": [

release_files/release_config.xml

@@ -31,12 +31,12 @@
     <opt>-Dfile.encoding=UTF-8</opt>
   </jre>
   <versionInfo>
-    <fileVersion>1.3.9.0</fileVersion>
-    <txtFileVersion>1.3.9</txtFileVersion>
+    <fileVersion>1.4.0.0</fileVersion>
+    <txtFileVersion>1.4.0</txtFileVersion>
     <fileDescription>MercuryTrade</fileDescription>
     <copyright>Morph21</copyright>
-    <productVersion>1.3.9.0</productVersion>
-    <txtProductVersion>1.3.9</txtProductVersion>
+    <productVersion>1.4.0.0</productVersion>
+    <txtProductVersion>1.4.0</txtProductVersion>
     <productName>MercuryTrade</productName>
     <companyName>Morph</companyName>
     <internalName>MercuryTrade</internalName>