Skip to content

Commit ce4db94

Browse files
authored
Merge pull request #214 from entrylabs/develop
version up : 2.1.21
2 parents 0d1ad91 + d4cfb67 commit ce4db94

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

build/entryx64.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
!define MUI_UNICON "icon.ico"
1414
!define PRODUCT_NAME "Entry"
1515
!define APP_NAME "Entry.exe"
16-
!define PRODUCT_VERSION "2.1.20"
16+
!define PRODUCT_VERSION "2.1.21"
1717
!define PRODUCT_PUBLISHER "EntryLabs"
1818
!define PRODUCT_WEB_SITE "http://www.playentry.org/"
1919

build/entryx86.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
!define MUI_UNICON "icon.ico"
1414
!define PRODUCT_NAME "Entry"
1515
!define APP_NAME "Entry.exe"
16-
!define PRODUCT_VERSION "2.1.20"
16+
!define PRODUCT_VERSION "2.1.21"
1717
!define PRODUCT_PUBLISHER "EntryLabs"
1818
!define PRODUCT_WEB_SITE "http://www.playentry.org/"
1919

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"productName": "Entry",
44
"name": "entry",
5-
"version": "2.1.20",
5+
"version": "2.1.21",
66
"description": "Entry for offline",
77
"main": "src/main_build/main.bundle.js",
88
"scripts": {
@@ -39,8 +39,8 @@
3939
"async-csv": "^2.1.3",
4040
"axios": "^0.19.2",
4141
"cross-spawn": "^7.0.3",
42-
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.58_2",
43-
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.20",
42+
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.59_2",
43+
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.21",
4444
"entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
4545
"@entrylabs/legacy-video": "^1.0.0",
4646
"excel4node": "^1.7.0",

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5212,9 +5212,9 @@ entities@^2.0.0:
52125212
dependencies:
52135213
crypto-js "^4.0.0"
52145214

5215-
"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.58_2":
5216-
version "1.9.58"
5217-
resolved "git+https://github.com/entrylabs/entry-hw.git#f4c93bdb41ef097df7e501acd30ca8ac98fee3e2"
5215+
"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.59_2":
5216+
version "1.9.59"
5217+
resolved "git+https://github.com/entrylabs/entry-hw.git#7642f98a275662598cd7a1d0c172a90c197a7a99"
52185218
dependencies:
52195219
cross-spawn "^7.0.0"
52205220
fs-extra "^8.1.0"
@@ -5229,9 +5229,9 @@ entities@^2.0.0:
52295229
winston "^3.2.1"
52305230
winston-daily-rotate-file "^4.4.2"
52315231

5232-
"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.20":
5233-
version "4.0.12"
5234-
resolved "git+https://github.com/entrylabs/entryjs.git#187cb575facd3c59ecaa9e9f8f867fcd57f061f0"
5232+
"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.21":
5233+
version "4.0.14"
5234+
resolved "git+https://github.com/entrylabs/entryjs.git#f4becaacd2c584e85c23640f781a3ec0ee4a4d89"
52355235
dependencies:
52365236
uid "^0.0.2"
52375237
"@entrylabs/event" "^1.0.3"

0 commit comments

Comments
 (0)