From 210b688121b8d634a4da288308a37aaa215b1caf Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Thu, 19 Dec 2024 16:45:32 +0900 Subject: [PATCH 1/2] version up : 2.1.22 --- build/entryx64.nsi | 2 +- build/entryx86.nsi | 2 +- package.json | 6 +++--- yarn.lock | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/entryx64.nsi b/build/entryx64.nsi index 05b94c2b3..4e9ada691 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.21" +!define PRODUCT_VERSION "2.1.22" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/build/entryx86.nsi b/build/entryx86.nsi index d7e021ffd..5afdd9de1 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.21" +!define PRODUCT_VERSION "2.1.22" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/package.json b/package.json index 611ed31cf..e81ff8cca 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "productName": "Entry", "name": "entry", - "version": "2.1.21", + "version": "2.1.22", "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.59_2", - "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.21", + "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.60_2", + "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.22", "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 index bb848abc2..0756332c5 100644 --- 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.59_2": - version "1.9.59" - resolved "git+https://github.com/entrylabs/entry-hw.git#7642f98a275662598cd7a1d0c172a90c197a7a99" +"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.60_2": + version "1.9.60" + resolved "git+https://github.com/entrylabs/entry-hw.git#9382b5cb59d2162779765df87ae1649e4b992410" 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.21": +"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.22": version "4.0.14" - resolved "git+https://github.com/entrylabs/entryjs.git#f4becaacd2c584e85c23640f781a3ec0ee4a4d89" + resolved "git+https://github.com/entrylabs/entryjs.git#f49c418dd7f30dcbd7a41222d2d3e23aca379924" dependencies: uid "^0.0.2" "@entrylabs/event" "^1.0.3" From ad0fedc666f90f4f38c39bf9e80b4e38444ef480 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Thu, 19 Dec 2024 16:54:04 +0900 Subject: [PATCH 2/2] =?UTF-8?q?lang:=20=EC=8B=A0=EA=B7=9C=20=ED=8C=90?= =?UTF-8?q?=EB=8B=A8=EB=B8=94=EB=A1=9D=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/resources/lang/en.json | 9 +++++++++ src/renderer/resources/lang/ko.json | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/src/renderer/resources/lang/en.json b/src/renderer/resources/lang/en.json index 15dc419ee..caaea2a5e 100644 --- a/src/renderer/resources/lang/en.json +++ b/src/renderer/resources/lang/en.json @@ -1351,6 +1351,10 @@ "XBOT_analog": "Analog", "XBOT_CDS": "Light Sensor Value", "XBOT_MIC": "Mic Sensor Value", + "yell": "yell", + "desktop": "desktop", + "tablet": "tablet", + "smartphone": "smartphone", "XBOT_analog0": "Analog PIN0 Value", "XBOT_analog1": "Analog PIN1 Value", "XBOT_analog2": "Analog PIN2 Value", @@ -7185,6 +7189,9 @@ "boolean_and": "Checks whether both conditions are true.", "boolean_or": "Checks whether at least one of the two conditions is true.", "boolean_not": "Changes the input conditions to its opposite.\n(If the input condition is true, it returns 'False'. And if the input condition is false, it returns 'True'.)", + "is_boost_mode": "Checks whether the boost mode is turned on or not.\nIf the boost mode is on, it is judged as 'True'.", + "is_current_device_type": "If the device that runs the project is the selected device, it is judged as 'true'.", + "is_touch_supported": "If the device that runs the project is a touch screen, it is judged as 'true'.", "calc_basic": "Adds two input numbers.", "calc_rand": "Selects a random value between the two input numbers.", "get_x_coordinate": "Reports the x-position value of the object.", @@ -8740,6 +8747,8 @@ "boolean_or": "%1 %2 %3", "boolean_not": "%1 %2 %3", "is_boost_mode": "%1", + "is_current_device_type": "is the project running on %1 ?", + "is_touch_supported": "touch screen?", "true_or_false": "%1", "True": "%1 ", "False": "%1 ", diff --git a/src/renderer/resources/lang/ko.json b/src/renderer/resources/lang/ko.json index 72013fe99..55817ed25 100644 --- a/src/renderer/resources/lang/ko.json +++ b/src/renderer/resources/lang/ko.json @@ -383,6 +383,9 @@ "speak": "말하기", "think": "생각하기", "yell": "외치기", + "desktop": "데스크톱", + "tablet": "태블릿", + "smartphone": "스마트폰", "block_hi": "안녕!", "LOOKS_change_shape_next": "다음", "LOOKS_change_shape_prev": "이전", @@ -2289,6 +2292,8 @@ "boolean_and_or": "그리고 : 두 판단이 모두 참인 경우 ‘참’으로 판단합니다.\n또는 : 두 판단 중 하나라도 참이 있는 경우 ‘참’으로 판단합니다.", "boolean_not": "해당 판단이 참이면 거짓, 거짓이면 참으로 만듭니다.", "is_boost_mode": "부스트모드가 켜져 있으면 ‘참’으로 판단합니다.", + "is_current_device_type": "작품을 실행하는 기기가 선택한 기기라면 '참'으로 판단합니다.", + "is_touch_supported": "작품을 실행하는 기기에서 화면을 터치할 수 있다면 '참'으로 판단합니다.", "calc_basic": "입력한 두 수의 사칙연산 값입니다.\n+ : 입력한 두 수를 더한 값입니다.\n- : 입력한 두 수를 뺀 값입니다.\n* : 입력한 두 수를 곱한 값입니다.\n/ : 입력한 두 수를 나눈 값입니다.", "calc_rand": "입력한 두 수 사이에서 선택된 무작위 수 값입니다. (두 수 모두 정수를 입력한 경우 정수가, 두 수 중 하나라도 소수를 입력한 경우 소숫점 둘째 자리의 소수 값이 선택됩니다.)", "coordinate_mouse": "마우스 포인터의 x 또는 y 좌푯값입니다.", @@ -2890,6 +2895,8 @@ "False": "%1 ", "boolean_not": "%1 %2 %3", "is_boost_mode": "%1", + "is_current_device_type": "%1 에서 실행하는가?", + "is_touch_supported": "화면을 터치할 수 있는가?", "calc_basic": "%1 %2 %3", "calc_rand": "%1 %2 %3 %4 %5", "coordinate_mouse": "%1 %2 %3",