Merge pull request #141 from entrylabs/develop

PR 2.0.47

build/entryx64.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.0.46"
+!define PRODUCT_VERSION "2.0.47"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

build/entryx86.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.0.46"
+!define PRODUCT_VERSION "2.0.47"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

package.json

@@ -2,7 +2,7 @@
     "private": true,
     "productName": "Entry",
     "name": "entry",
-    "version": "2.0.46",
+    "version": "2.0.47",
     "description": "Entry for offline",
     "main": "src/main_build/main.bundle.js",
     "scripts": {
@@ -34,8 +34,8 @@
         "async-csv": "^2.1.3",
         "axios": "^0.19.2",
         "cross-spawn": "^7.0.3",
-        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.29",
-        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.46",
+        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.30",
+        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.47",
         "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/develop",
         "excel4node": "^1.7.0",
         "fs-extra": "^8.1.0",

src/renderer/helper/entry/entryPatcher.ts

@@ -70,7 +70,7 @@ export default function() {
                         (function(i) {
                             topBlock.view.getDataUrl()
                                 .then(function(data: any) {
-                                    const savePath = `${dirPath[0]}${Constants.sep}${i}${'.png'}`;
+                                    const savePath = `${dirPath}${Constants.sep}${i}${'.png'}`;
                                     RendererUtils.saveBlockImage(data.src, savePath);
                                 });
                         })(++index);

src/renderer/resources/lang/code.json

@@ -1340,6 +1340,7 @@
         "JUDGEMENT_is_press_some_key_2": "키가 눌러져 있는가?",
         "JUDGEMENT_reach_something_1": "",
         "JUDGEMENT_reach_something_2": "에 닿았는가?",
+        "JUDGEMENT_is_boost_mode": "부스트모드가 켜져 있는가?",
         "JUDGEMENT_boolean_not_1": "",
         "JUDGEMENT_boolean_not_2": "(이)가 아니다",
         "CALC_calc_rand_1": "",
@@ -4300,6 +4301,7 @@
         "boolean_and_or": "%1 %2 %3",
         "False": "%1  ",
         "boolean_not": "%1 %2 %3",
+        "is_boost_mode": "%1",
         "calc_basic": "%1 %2 %3",
         "calc_rand": "%1 %2 %3 %4 %5",
         "coordinate_mouse": "%1 %2 %3",

src/renderer/resources/lang/ebs.json

@@ -1340,6 +1340,7 @@
         "JUDGEMENT_is_press_some_key_2": "키가 눌러져 있는가?",
         "JUDGEMENT_reach_something_1": "",
         "JUDGEMENT_reach_something_2": "에 닿았는가?",
+        "JUDGEMENT_is_boost_mode": "부스트모드가 켜져 있는가?",
         "JUDGEMENT_boolean_not_1": "",
         "JUDGEMENT_boolean_not_2": "(이)가 아니다",
         "CALC_calc_rand_1": "",
@@ -4300,6 +4301,7 @@
         "boolean_and_or": "%1 %2 %3",
         "False": "%1  ",
         "boolean_not": "%1 %2 %3",
+        "is_boost_mode": "%1",
         "calc_basic": "%1 %2 %3",
         "calc_rand": "%1 %2 %3 %4 %5",
         "coordinate_mouse": "%1 %2 %3",

src/renderer/resources/lang/en.json

@@ -795,6 +795,7 @@
         "JUDGEMENT_is_press_some_key_2": " pressed?",
         "JUDGEMENT_reach_something_1": "touching",
         "JUDGEMENT_reach_something_2": "?",
+        "JUDGEMENT_is_boost_mode": "Is boost mode?",
         "JUDGEMENT_true": "True",
         "LOOKS": "Looks",
         "LOOKS_change_scale_percent_1": "Change scale by",
@@ -8504,6 +8505,7 @@
         "boolean_and": "%1 %2 %3",
         "boolean_or": "%1 %2 %3",
         "boolean_not": "%1 %2 %3",
+        "is_boost_mode": "%1",
         "true_or_false": "%1",
         "True": "%1  ",
         "False": "%1  ",

src/renderer/resources/lang/jp.json

@@ -795,6 +795,7 @@
         "JUDGEMENT_is_press_some_key_2": "キーを押しているか？",
         "JUDGEMENT_reach_something_1": " ",
         "JUDGEMENT_reach_something_2": "に着いたか？",
+        "JUDGEMENT_is_boost_mode": "ブーストモードがオンになっているか？",
         "JUDGEMENT_true": " true",
         "LOOKS": "見た目",
         "LOOKS_change_scale_percent_1": "サイズを",
@@ -8512,6 +8513,7 @@
         "boolean_and": "%1 %2 %3",
         "boolean_or": "%1 %2 %3",
         "boolean_not": "%1 %2 %3",
+        "is_boost_mode": "%1",
         "true_or_false": "%1",
         "True": "%1",
         "False": "%1",

src/renderer/resources/lang/ko.json

@@ -378,6 +378,7 @@
         "JUDGEMENT_is_press_some_key_2": "키가 눌러져 있는가?",
         "JUDGEMENT_reach_something_1": "",
         "JUDGEMENT_reach_something_2": "에 닿았는가?",
+        "JUDGEMENT_is_boost_mode": "부스트모드가 켜져 있는가?",
         "JUDGEMENT_boolean_not_1": "",
         "JUDGEMENT_boolean_not_2": "(이)가 아니다",
         "CALC_calc_rand_1": "",
@@ -2543,6 +2544,7 @@
         "boolean_and_or": "%1 %2 %3",
         "False": "%1  ",
         "boolean_not": "%1 %2 %3",
+        "is_boost_mode": "%1",
         "calc_basic": "%1 %2 %3",
         "calc_rand": "%1 %2 %3 %4 %5",
         "coordinate_mouse": "%1 %2 %3",

src/renderer/resources/lang/vn.json

@@ -8504,6 +8504,7 @@
         "boolean_and": "%1 %2 %3",
         "boolean_or": "%1 %2 %3",
         "boolean_not": "%1 %2 %3",
+        "is_boost_mode": "%1",
         "true_or_false": "%1",
         "True": "%1",
         "False": "%1",

yarn.lock

@@ -3098,9 +3098,9 @@ enquirer@^2.3.5:
   dependencies:
     crypto-js "^4.0.0"
 
-"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.29":
-  version "1.9.29"
-  resolved "git+https://github.com/entrylabs/entry-hw.git#326ab3070f1716df314eb7beecec27996daf938b"
+"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.30":
+  version "1.9.30"
+  resolved "git+https://github.com/entrylabs/entry-hw.git#cd13ceb67e25fb36b94b23555a2d18488d109641"
   dependencies:
     cross-spawn "^7.0.0"
     fs-extra "^8.1.0"
@@ -3115,9 +3115,9 @@ enquirer@^2.3.5:
     winston "^3.2.1"
     winston-daily-rotate-file "^4.4.2"
 
-"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.46":
+"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.47":
   version "0.0.0"
-  resolved "git+https://github.com/entrylabs/entryjs.git#c8e7cb19a855320cc145572dbebf22c20dd36306"
+  resolved "git+https://github.com/entrylabs/entryjs.git#1160d9c175f9defc70fb8734a181354cd65e8477"
 
 "entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/develop":
   version "0.0.0"