Merge pull request #214 from entrylabs/develop

version up : 2.1.21
entrylabs · Nov 21, 2024 · ce4db94 · ce4db94
2 parents 0d1ad91 + d4cfb67
commit ce4db94
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git 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.20"
+!define PRODUCT_VERSION "2.1.21"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git 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.20"
+!define PRODUCT_VERSION "2.1.21"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "private": true,
     "productName": "Entry",
     "name": "entry",
-    "version": "2.1.20",
+    "version": "2.1.21",
     "description": "Entry for offline",
     "main": "src/main_build/main.bundle.js",
     "scripts": {
@@ -39,8 +39,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.58_2",
-        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.20",
+        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.59_2",
+        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.21",
         "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
         "@entrylabs/legacy-video": "^1.0.0",
         "excel4node": "^1.7.0",

diff --git a/yarn.lock b/yarn.lock
@@ -5212,9 +5212,9 @@ entities@^2.0.0:
   dependencies:
     crypto-js "^4.0.0"
 
-"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.58_2":
-  version "1.9.58"
-  resolved "git+https://github.com/entrylabs/entry-hw.git#f4c93bdb41ef097df7e501acd30ca8ac98fee3e2"
+"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.59_2":
+  version "1.9.59"
+  resolved "git+https://github.com/entrylabs/entry-hw.git#7642f98a275662598cd7a1d0c172a90c197a7a99"
   dependencies:
     cross-spawn "^7.0.0"
     fs-extra "^8.1.0"
@@ -5229,9 +5229,9 @@ entities@^2.0.0:
     winston "^3.2.1"
     winston-daily-rotate-file "^4.4.2"
 
-"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.20":
-  version "4.0.12"
-  resolved "git+https://github.com/entrylabs/entryjs.git#187cb575facd3c59ecaa9e9f8f867fcd57f061f0"
+"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.21":
+  version "4.0.14"
+  resolved "git+https://github.com/entrylabs/entryjs.git#f4becaacd2c584e85c23640f781a3ec0ee4a4d89"
   dependencies:
     uid "^0.0.2"
     "@entrylabs/event" "^1.0.3"