Skip to content

Commit

Permalink
Merge pull request #165 from entrylabs/develop
Browse files Browse the repository at this point in the history
2.0.53 PR
  • Loading branch information
Tnks2U authored Dec 23, 2022
2 parents e9969dd + 01457f9 commit efadebc
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 387 deletions.
2 changes: 1 addition & 1 deletion build/entryx64.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
!define MUI_UNICON "icon.ico"
!define PRODUCT_NAME "Entry"
!define APP_NAME "Entry.exe"
!define PRODUCT_VERSION "2.0.52"
!define PRODUCT_VERSION "2.0.53"
!define PRODUCT_PUBLISHER "EntryLabs"
!define PRODUCT_WEB_SITE "http://www.playentry.org/"

Expand Down
2 changes: 1 addition & 1 deletion build/entryx86.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
!define MUI_UNICON "icon.ico"
!define PRODUCT_NAME "Entry"
!define APP_NAME "Entry.exe"
!define PRODUCT_VERSION "2.0.52"
!define PRODUCT_VERSION "2.0.53"
!define PRODUCT_PUBLISHER "EntryLabs"
!define PRODUCT_WEB_SITE "http://www.playentry.org/"

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"productName": "Entry",
"name": "entry",
"version": "2.0.52",
"version": "2.0.53",
"description": "Entry for offline",
"main": "src/main_build/main.bundle.js",
"scripts": {
Expand Down Expand Up @@ -35,8 +35,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.35",
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.52",
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.36",
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.53",
"entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20221024",
"excel4node": "^1.7.0",
"fs-extra": "^8.1.0",
Expand All @@ -50,6 +50,7 @@
"node-xlsx": "^0.15.0",
"puid": "^1.0.7",
"rimraf": "^2.6.3",
"sass": "^1.57.1",
"socket.io": "^2.2.0",
"socket.io-client": "^2.2.0",
"tar": "^4.4.10",
Expand Down Expand Up @@ -107,7 +108,6 @@
"fontfaceonload": "^1.0.2",
"immer": "^5.3.2",
"mocha": "^7.1.2",
"node-sass": "^4.11.0",
"prettier": "^1.15.3",
"react": "^16.7.0",
"react-dom": "^16.7.0",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit efadebc

Please sign in to comment.