Skip to content

Commit

Permalink
Merge pull request #199 from entrylabs/develop
Browse files Browse the repository at this point in the history
2.1.13
  • Loading branch information
Tnks2U authored Mar 22, 2024
2 parents c880491 + 4a16b1a commit 6cad836
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 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.1.12"
!define PRODUCT_VERSION "2.1.13"
!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.1.12"
!define PRODUCT_VERSION "2.1.13"
!define PRODUCT_PUBLISHER "EntryLabs"
!define PRODUCT_WEB_SITE "http://www.playentry.org/"

Expand Down
6 changes: 3 additions & 3 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.1.12",
"version": "2.1.13",
"description": "Entry for offline",
"main": "src/main_build/main.bundle.js",
"scripts": {
Expand Down Expand Up @@ -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.50",
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.12",
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.51",
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.13",
"entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
"excel4node": "^1.7.0",
"fluent-ffmpeg": "^2.1.2",
Expand Down
2 changes: 0 additions & 2 deletions src/renderer/components/workspace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,6 @@ class Workspace extends Component<IProps> {
Entry.disposeContainer();
// zoom 스케일이 변경된 상태에서 new project 한 경우 블록메뉴에 스케일정보가 남아서 초기화
Entry.getMainWS().setScale(1);
// INFO: 사운드에디터 인스턴스 초기화, 3월 정기배포에 변동가능성 있음
window?.EntrySoundEditor.destroy();
}
Entry.reloadBlock();
this.isFirstRender = false;
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3513,9 +3513,9 @@ enquirer@^2.3.5:
dependencies:
crypto-js "^4.0.0"

"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.50":
version "1.9.50"
resolved "git+https://github.com/entrylabs/entry-hw.git#2441918680f832d815ecc5799afaf5a8c3b02c07"
"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.51":
version "1.9.51"
resolved "git+https://github.com/entrylabs/entry-hw.git#fcaf5b49bd4113421199a7cdd85cdafb71ecb691"
dependencies:
cross-spawn "^7.0.0"
fs-extra "^8.1.0"
Expand All @@ -3530,9 +3530,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.12":
"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.13":
version "0.0.0"
resolved "git+https://github.com/entrylabs/entryjs.git#8677ff569bcfd7b788f42195eb961534cbd91905"
resolved "git+https://github.com/entrylabs/entryjs.git#b483e76b37c7425c7420b5986f0bcf8e65aa8987"

"entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/20231026":
version "0.0.0"
Expand Down

0 comments on commit 6cad836

Please sign in to comment.