Skip to content

Commit

Permalink
Release 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Morph21 committed Dec 20, 2024
1 parent b0e9b1d commit ae9771a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
8 changes: 8 additions & 0 deletions app-ui/src/main/resources/notes/patch/patch-notes-new.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
{
"version": "1.4.0",
"fix": [
{
"changed": "Fixed loading fonts for chinese and korean letters"
}
]
},
{
"version": "1.3.9",
"features": [
Expand Down
8 changes: 4 additions & 4 deletions release_files/release_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit ae9771a

Please sign in to comment.