From 9d25a78d9b136a957d3d21a2642553521033da2c Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Tue, 21 Mar 2023 18:06:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=202.1.2=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/entryx64.nsi | 2 +- build/entryx86.nsi | 2 +- package.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/entryx64.nsi b/build/entryx64.nsi index 18135ac0d..a085c1ec1 100644 --- a/build/entryx64.nsi +++ b/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.1.1" +!define PRODUCT_VERSION "2.1.2" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/build/entryx86.nsi b/build/entryx86.nsi index af3a1c827..4c6b24139 100644 --- a/build/entryx86.nsi +++ b/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.1.1" +!define PRODUCT_VERSION "2.1.2" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/package.json b/package.json index be98e4ad1..69bbb3670 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "productName": "Entry", "name": "entry", - "version": "2.1.1", + "version": "2.1.2", "description": "Entry for offline", "main": "src/main_build/main.bundle.js", "scripts": { @@ -36,8 +36,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.38", - "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.1", + "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.39", + "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.2", "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20221024", "excel4node": "^1.7.0", "fs-extra": "^8.1.0", From ff991bb1cbec0194aa65fb5d07de5e8085f61c9e Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Tue, 21 Mar 2023 20:11:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=88=98=EC=A0=95=EB=90=9C=20entry-?= =?UTF-8?q?hw=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 69bbb3670..1380e5c59 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "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.39", + "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.39_3", "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.2", "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20221024", "excel4node": "^1.7.0", diff --git a/yarn.lock b/yarn.lock index 97dada3f5..6a1b5ec6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3393,9 +3393,9 @@ enquirer@^2.3.5: dependencies: crypto-js "^4.0.0" -"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.37": - version "1.9.37" - resolved "git+https://github.com/entrylabs/entry-hw.git#07a194c14adb6623ccf978a0640999cbd3587e7e" +"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.39_3": + version "1.9.39" + resolved "git+https://github.com/entrylabs/entry-hw.git#78808975e4a4d5d45dc26f2b81ede5af925e24eb" dependencies: cross-spawn "^7.0.0" fs-extra "^8.1.0" @@ -3410,9 +3410,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.1.1": +"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.2": version "0.0.0" - resolved "git+https://github.com/entrylabs/entryjs.git#e9b50c4cfb0cab68f31332f80068deb4ebb90b92" + resolved "git+https://github.com/entrylabs/entryjs.git#8dd80bc0a615edbcb130d13b8ac85b266c1760ac" "entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/20221024": version "0.0.0"