Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daemon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mcsmanager-daemon",
"version": "4.12.1",
"version": "4.12.2",
"description": "Provides remote control capability for MCSManager to manage processes, scheduled tasks, I/O streams, and more",
"scripts": {
"dev": "nodemon --watch src --ext ts,js --exec \"npm run build && node --enable-source-maps production/app.js\"",
Expand Down
6 changes: 5 additions & 1 deletion daemon/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ module.exports = {
moduleIds: "named"
},
externalsPresets: { node: true },
externals: [nodeExternals()],
externals: [
nodeExternals({
allowlist: ["mcsmanager-common"]
})
],
output: {
filename: "app.js",
path: path.resolve(__dirname, "production")
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/widgets/instance/ManagerBtns.vue
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@ const btns = computed(() => {
click: () => {
javaManagerDialog.value?.openDialog();
},
condition: () => instanceInfo.value?.config.type.includes(TYPE_MINECRAFT_JAVA) ?? false
condition: () =>
(instanceInfo.value?.config.type.includes(TYPE_MINECRAFT_JAVA) &&
instanceInfo.value?.config.processType === "general") ??
false
},
{
title: t("TXT_CODE_656a85d8"),
Expand Down
6 changes: 3 additions & 3 deletions languages/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
"TXT_CODE_1fec78cc": "Stellen Sie dies auf True ein, um das Kollisionsgrenzfeld der gesamten Entität auf Leitern zu überprüfen, anstatt nur den Block, in dem sie sich befinden. Verursacht bemerkenswerte Unterschiede in der Mechanik, sodass Standard das Vanilleverhalten ist. \nStandard: Falsch.",
"TXT_CODE_20053f37": "Blockfallmultiplikator für hellgraues Bett",
"TXT_CODE_201bc643": "kein Schutz",
"TXT_CODE_2025658e": "Hytale Server",
"TXT_CODE_2029027e": "Die Konfiguration des offenen Ports dieses Containers ist falsch und es gibt keine Werte auf der linken und rechten Seite des Trennzeichens!",
"TXT_CODE_2033383b": "Verzögerung zwischen Wellen. \nJe niedriger der Wert, desto mehr Kreaturen gibt es",
"TXT_CODE_2038ec2c": "Bitte wählen Sie mindestens ein Profil aus!",
Expand Down Expand Up @@ -2371,6 +2372,7 @@
"TXT_CODE_de1b06cd": "Dateiname muss ausgefüllt werden",
"TXT_CODE_de1ece3c": "Beruhigt den Eisengolem, wenn er geheilt ist, wenn er wütend ist",
"TXT_CODE_de3ced4b": "Bitte geben Sie den Bildnamen ein",
"TXT_CODE_de449b5f": "Folia Server",
"TXT_CODE_de567e84": "Benutzer <<operator_name>> löscht die Datei <<file>> der <<instance_name>> Instanz",
"TXT_CODE_de61c48c": "Notizblockaktualisierungen deaktivieren",
"TXT_CODE_de854aa6": "Maximale Sekunden, die ein Phantom zum Spawnen benötigt",
Expand Down Expand Up @@ -2929,7 +2931,5 @@
"TXT_CODE_system_instance_control.existRepeatTask": "Es sind bereits doppelte Aufgaben vorhanden",
"TXT_CODE_system_instance_control.illegalName": "Falscher Projektname, unterstützt nur Unterstriche, Zahlen, Buchstaben und einige lokale Sprachen",
"TXT_CODE_ui.help": "[Konsole] Der Daemon verfügt über grundlegende interaktive Funktionen. Bitte geben Sie „Hilfe“ ein, um weitere Informationen anzuzeigen",
"TXT_CODE_de449b5f": "Folia Server",
"TXT_CODE_2025658e": "Hytale Server",
"TXT_CODE_version.versionDetectErr": "Die Versionsprüfung ist fehlgeschlagen"
}
}
86 changes: 49 additions & 37 deletions languages/en_US.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/es_ES.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/fr_FR.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/ja_JP.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/ko_KR.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/pt_BR.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/ru_RU.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/th_TH.json

Large diffs are not rendered by default.

51 changes: 48 additions & 3 deletions languages/tr_TR.json

Large diffs are not rendered by default.

73 changes: 49 additions & 24 deletions languages/zh_CN.json

Large diffs are not rendered by default.

49 changes: 47 additions & 2 deletions languages/zh_TW.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions panel/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mcsmanager-panel",
"version": "10.12.2",
"daemonVersion": "4.12.1",
"version": "10.12.4",
"daemonVersion": "4.12.2",
"description": "Provide MCSManager with the ability to connect and control all Daemons, and provide API services for the front end.",
"scripts": {
"dev": "nodemon --watch src --ext ts,js --exec \"npm run build && node --enable-source-maps production/app.js\"",
Expand Down
6 changes: 5 additions & 1 deletion panel/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ module.exports = {
moduleIds: "named"
},
externalsPresets: { node: true },
externals: [nodeExternals()],
externals: [
nodeExternals({
allowlist: ["mcsmanager-common"]
})
],
output: {
filename: "app.js",
path: path.resolve(__dirname, "production")
Expand Down