diff --git a/.travis.yml b/.travis.yml index ba32317da..8202bc5c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_deploy: - git config --global user.email ${GITHUB_EMAIL} - git config --global user.name ${GITHUB_NAME} - git tag ${VERSION_ROOT}.${TRAVIS_BUILD_NUMBER} - - git push --tags + - git push -q ${REPO} --tags deploy: provider: releases api_key: diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java index ce99d1e6c..592309ab4 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java @@ -86,7 +86,7 @@ public final class ModpackManager { @Override public void executeTask() throws Throwable { String id = idFUCK; - String description = C.i18n("modpack.install.will_install"); + String description = C.i18n("modpack.task.install.will"); // Read modpack name and description from `modpack.json` try (ZipFile zip = new ZipFile(input)) { @@ -106,7 +106,7 @@ public final class ModpackManager { // Show a window to let the user know that what and how the modpack is. Object msgs[] = new Object[2]; - msgs[0] = C.i18n("modpack.install.task"); + msgs[0] = C.i18n("modpack.task.install"); msgs[1] = new WebPage(description); ((WebPage) msgs[1]).setPreferredSize(new Dimension(800, 350)); int result = JOptionPane.showOptionDialog(null, msgs, (String) msgs[0], JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, null); @@ -191,7 +191,7 @@ public final class ModpackManager { @Override public String getInfo() { - return C.i18n("modpack.install.task"); + return C.i18n("modpack.task.install"); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form index 5cb5ec6f5..4a7db3ca7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.form @@ -258,7 +258,7 @@ - + @@ -268,7 +268,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java index 21556e945..4bb2664ac 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java @@ -233,14 +233,14 @@ public class MainPagePanel extends AnimatedPanel { pnlPassword.add(jPanel3, "card3"); - btnImportModpack.setText(C.i18n("modpack.install.task")); // NOI18N + btnImportModpack.setText(C.i18n("modpack.task.install")); // NOI18N btnImportModpack.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnImportModpackActionPerformed(evt); } }); - btnExportModpack.setText(C.i18n("modpack.save.task")); // NOI18N + btnExportModpack.setText(C.i18n("modpack.task.save")); // NOI18N btnExportModpack.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { btnExportModpackActionPerformed(evt); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form index 342aaba4c..2c95beec6 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.form @@ -46,7 +46,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -91,7 +91,9 @@ - + + + @@ -110,7 +112,7 @@ - + @@ -131,7 +133,9 @@ - + + + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java index afeba8aa5..0f2bda974 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/modpack/ModpackInitializationPanel.java @@ -82,7 +82,7 @@ public class ModpackInitializationPanel extends javax.swing.JPanel { txtModpackName = new javax.swing.JTextField(); chkIncludeLauncher = new javax.swing.JCheckBox(); - lblModpackLocation.setText(C.i18n("modpack.save")); // NOI18N + lblModpackLocation.setText(C.i18n("modpack.wizard.step.initialization.save")); // NOI18N txtModpackLocation.addCaretListener(new javax.swing.event.CaretListener() { public void caretUpdate(javax.swing.event.CaretEvent evt) { @@ -97,7 +97,7 @@ public class ModpackInitializationPanel extends javax.swing.JPanel { } }); - lblGameVersion.setText("要导出的游戏版本"); + lblGameVersion.setText(C.i18n("modpack.wizard.step.initialization.exported_version")); // NOI18N cboGameVersion.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { @@ -105,7 +105,7 @@ public class ModpackInitializationPanel extends javax.swing.JPanel { } }); - jLabel1.setText(C.i18n("modpack.warning")); // NOI18N + jLabel1.setText(C.i18n("modpack.wizard.step.initialization.warning")); // NOI18N jLabel2.setText(C.i18n("modpack.name")); // NOI18N @@ -116,7 +116,7 @@ public class ModpackInitializationPanel extends javax.swing.JPanel { } }); - chkIncludeLauncher.setText("包含启动器"); + chkIncludeLauncher.setText(C.i18n("modpack.wizard.step.initialization.include_launcher")); // NOI18N chkIncludeLauncher.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { chkIncludeLauncherItemStateChanged(evt); @@ -140,7 +140,7 @@ public class ModpackInitializationPanel extends javax.swing.JPanel { .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(lblGameVersion) - .addComponent(jLabel1) + .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel2) .addComponent(chkIncludeLauncher)) .addGap(0, 0, Short.MAX_VALUE))) @@ -150,8 +150,8 @@ public class ModpackInitializationPanel extends javax.swing.JPanel { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addComponent(jLabel1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 61, Short.MAX_VALUE) + .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 19, Short.MAX_VALUE) .addComponent(jLabel2) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(txtModpackName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -174,7 +174,7 @@ public class ModpackInitializationPanel extends javax.swing.JPanel { private void cboModpackLocationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cboModpackLocationActionPerformed JFileChooser fc = new JFileChooser(); fc.setFileSelectionMode(JFileChooser.FILES_ONLY); - fc.setDialogTitle(C.i18n("modpack.save")); + fc.setDialogTitle(C.i18n("modpack.wizard.step.initialization.save")); fc.setMultiSelectionEnabled(false); fc.setFileFilter(new FileNameExtensionFilter(C.i18n("modpack") + "(*.zip)", "zip")); fc.showSaveDialog(this); diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang index 2631ed94b..81abb39f4 100755 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang @@ -221,29 +221,34 @@ settings.test_game=测试游戏 modpack=整合包 modpack.choose=选择要导入的游戏整合包文件，如果您希望更新整合包，请输入要更新的版本名 -modpack.install.task=导入整合包 -modpack.install_error=安装失败，可能是整合包格式不正确或操作文件失败 -modpack.install.will_install=将会安装整合包： -modpack.save=选择要导出到的游戏整合包位置 -modpack.save.task=导出整合包 modpack.export_error=导出失败，可能是您的游戏文件夹格式不正确或操作文件失败 modpack.export_finished=整合包导出完成，参见 modpack.included_launcher=整合包已包含启动器，可直接发布 modpack.not_included_launcher=整合包未包含启动器，可使用本软件的导入整合包功能导入整合包 modpack.enter_name=给游戏起个你喜欢的名字 + +modpack.task.save=导出整合包 +modpack.task.install=导入整合包 +modpack.task.install.error=安装失败，可能是整合包格式不正确或操作文件失败 +modpack.task.install.will=将会安装整合包： + modpack.wizard=导出整合包向导 modpack.wizard.step.1=基本设置 modpack.wizard.step.1.title=设置整合包的主要信息 +modpack.wizard.step.initialization.include_launcher=包含启动器 +modpack.wizard.step.initialization.exported_version=要导出的游戏版本 +modpack.wizard.step.initialization.save=选择要导出到的游戏整合包位置 +modpack.wizard.step.initialization.warning=在制作整合包前，请您确认您选择的版本可以正常启动，
并保证您的Minecraft是正式版而非快照版，
而且不应当将不允许非官方途径传播的Mod、材质包等纳入整合包。
整合包会保存您目前的下载源设置 modpack.wizard.step.2=文件选择 modpack.wizard.step.2.title=选中你不想加到整合包中的文件(夹) modpack.wizard.step.3=整合包描述 modpack.wizard.step.3.title=描述你要制作的整合包 + modpack.desc=描述你要制作的整合包，比如整合包注意事项和更新记录，支持Markdown(图片请用网络图片)。 modpack.incorrect_format.no_json=整合包格式错误，pack.json丢失 modpack.incorrect_format.no_jar=整合包格式错误，pack.json丢失jar字段 modpack.cannot_read_version=读取游戏版本失败 modpack.not_a_valid_location=不是一个有效整合包位置 -modpack.warning=在制作整合包前，请您确认您选择的版本可以正常启动，
并保证您的Minecraft是正式版而非快照版，
而且不应当将不允许非官方途径传播的Mod、材质包等纳入整合包。
整合包会保存您目前的下载源设置 modpack.name=整合包名称 modpack.not_a_valid_name=不是一个有效的整合包名称 diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties index ffa82e9f1..c0094fadf 100755 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties @@ -221,29 +221,34 @@ settings.test_game=\u6d4b\u8bd5\u6e38\u620f modpack=\u6574\u5408\u5305 modpack.choose=\u9009\u62e9\u8981\u5bfc\u5165\u7684\u6e38\u620f\u6574\u5408\u5305\u6587\u4ef6\uff0c\u5982\u679c\u60a8\u5e0c\u671b\u66f4\u65b0\u6574\u5408\u5305\uff0c\u8bf7\u8f93\u5165\u8981\u66f4\u65b0\u7684\u7248\u672c\u540d -modpack.install.task=\u5bfc\u5165\u6574\u5408\u5305 -modpack.install_error=\u5b89\u88c5\u5931\u8d25\uff0c\u53ef\u80fd\u662f\u6574\u5408\u5305\u683c\u5f0f\u4e0d\u6b63\u786e\u6216\u64cd\u4f5c\u6587\u4ef6\u5931\u8d25 -modpack.install.will_install=\u5c06\u4f1a\u5b89\u88c5\u6574\u5408\u5305\uff1a -modpack.save=\u9009\u62e9\u8981\u5bfc\u51fa\u5230\u7684\u6e38\u620f\u6574\u5408\u5305\u4f4d\u7f6e -modpack.save.task=\u5bfc\u51fa\u6574\u5408\u5305 modpack.export_error=\u5bfc\u51fa\u5931\u8d25\uff0c\u53ef\u80fd\u662f\u60a8\u7684\u6e38\u620f\u6587\u4ef6\u5939\u683c\u5f0f\u4e0d\u6b63\u786e\u6216\u64cd\u4f5c\u6587\u4ef6\u5931\u8d25 modpack.export_finished=\u6574\u5408\u5305\u5bfc\u51fa\u5b8c\u6210\uff0c\u53c2\u89c1 modpack.included_launcher=\u6574\u5408\u5305\u5df2\u5305\u542b\u542f\u52a8\u5668\uff0c\u53ef\u76f4\u63a5\u53d1\u5e03 modpack.not_included_launcher=\u6574\u5408\u5305\u672a\u5305\u542b\u542f\u52a8\u5668\uff0c\u53ef\u4f7f\u7528\u672c\u8f6f\u4ef6\u7684\u5bfc\u5165\u6574\u5408\u5305\u529f\u80fd\u5bfc\u5165\u6574\u5408\u5305 modpack.enter_name=\u7ed9\u6e38\u620f\u8d77\u4e2a\u4f60\u559c\u6b22\u7684\u540d\u5b57 + +modpack.task.save=\u5bfc\u51fa\u6574\u5408\u5305 +modpack.task.install=\u5bfc\u5165\u6574\u5408\u5305 +modpack.task.install.error=\u5b89\u88c5\u5931\u8d25\uff0c\u53ef\u80fd\u662f\u6574\u5408\u5305\u683c\u5f0f\u4e0d\u6b63\u786e\u6216\u64cd\u4f5c\u6587\u4ef6\u5931\u8d25 +modpack.task.install.will=\u5c06\u4f1a\u5b89\u88c5\u6574\u5408\u5305\uff1a + modpack.wizard=\u5bfc\u51fa\u6574\u5408\u5305\u5411\u5bfc modpack.wizard.step.1=\u57fa\u672c\u8bbe\u7f6e modpack.wizard.step.1.title=\u8bbe\u7f6e\u6574\u5408\u5305\u7684\u4e3b\u8981\u4fe1\u606f +modpack.wizard.step.initialization.include_launcher=\u5305\u542b\u542f\u52a8\u5668 +modpack.wizard.step.initialization.exported_version=\u8981\u5bfc\u51fa\u7684\u6e38\u620f\u7248\u672c +modpack.wizard.step.initialization.save=\u9009\u62e9\u8981\u5bfc\u51fa\u5230\u7684\u6e38\u620f\u6574\u5408\u5305\u4f4d\u7f6e +modpack.wizard.step.initialization.warning=\u5728\u5236\u4f5c\u6574\u5408\u5305\u524d\uff0c\u8bf7\u60a8\u786e\u8ba4\u60a8\u9009\u62e9\u7684\u7248\u672c\u53ef\u4ee5\u6b63\u5e38\u542f\u52a8\uff0c
\u5e76\u4fdd\u8bc1\u60a8\u7684Minecraft\u662f\u6b63\u5f0f\u7248\u800c\u975e\u5feb\u7167\u7248\uff0c
\u800c\u4e14\u4e0d\u5e94\u5f53\u5c06\u4e0d\u5141\u8bb8\u975e\u5b98\u65b9\u9014\u5f84\u4f20\u64ad\u7684Mod\u3001\u6750\u8d28\u5305\u7b49\u7eb3\u5165\u6574\u5408\u5305\u3002
\u6574\u5408\u5305\u4f1a\u4fdd\u5b58\u60a8\u76ee\u524d\u7684\u4e0b\u8f7d\u6e90\u8bbe\u7f6e modpack.wizard.step.2=\u6587\u4ef6\u9009\u62e9 modpack.wizard.step.2.title=\u9009\u4e2d\u4f60\u4e0d\u60f3\u52a0\u5230\u6574\u5408\u5305\u4e2d\u7684\u6587\u4ef6(\u5939) modpack.wizard.step.3=\u6574\u5408\u5305\u63cf\u8ff0 modpack.wizard.step.3.title=\u63cf\u8ff0\u4f60\u8981\u5236\u4f5c\u7684\u6574\u5408\u5305 + modpack.desc=\u63cf\u8ff0\u4f60\u8981\u5236\u4f5c\u7684\u6574\u5408\u5305\uff0c\u6bd4\u5982\u6574\u5408\u5305\u6ce8\u610f\u4e8b\u9879\u548c\u66f4\u65b0\u8bb0\u5f55\uff0c\u652f\u6301Markdown(\u56fe\u7247\u8bf7\u7528\u7f51\u7edc\u56fe\u7247)\u3002 modpack.incorrect_format.no_json=\u6574\u5408\u5305\u683c\u5f0f\u9519\u8bef\uff0cpack.json\u4e22\u5931 modpack.incorrect_format.no_jar=\u6574\u5408\u5305\u683c\u5f0f\u9519\u8bef\uff0cpack.json\u4e22\u5931jar\u5b57\u6bb5 modpack.cannot_read_version=\u8bfb\u53d6\u6e38\u620f\u7248\u672c\u5931\u8d25 modpack.not_a_valid_location=\u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u6574\u5408\u5305\u4f4d\u7f6e -modpack.warning=\u5728\u5236\u4f5c\u6574\u5408\u5305\u524d\uff0c\u8bf7\u60a8\u786e\u8ba4\u60a8\u9009\u62e9\u7684\u7248\u672c\u53ef\u4ee5\u6b63\u5e38\u542f\u52a8\uff0c
\u5e76\u4fdd\u8bc1\u60a8\u7684Minecraft\u662f\u6b63\u5f0f\u7248\u800c\u975e\u5feb\u7167\u7248\uff0c
\u800c\u4e14\u4e0d\u5e94\u5f53\u5c06\u4e0d\u5141\u8bb8\u975e\u5b98\u65b9\u9014\u5f84\u4f20\u64ad\u7684Mod\u3001\u6750\u8d28\u5305\u7b49\u7eb3\u5165\u6574\u5408\u5305\u3002
\u6574\u5408\u5305\u4f1a\u4fdd\u5b58\u60a8\u76ee\u524d\u7684\u4e0b\u8f7d\u6e90\u8bbe\u7f6e modpack.name=\u6574\u5408\u5305\u540d\u79f0 modpack.not_a_valid_name=\u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u6574\u5408\u5305\u540d\u79f0 diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang index d19a23d4a..e70e150c2 100755 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang @@ -221,29 +221,34 @@ settings.test_game=Test game modpack=Mod pack modpack.choose=Choose a modpack zip file which you want to import. If you want to update the modpack, please enter the version you want to update. -modpack.install.task=Import the modpack -modpack.install_error=Failed to install the modpack, maybe the modpack file is incorrect or failed to manage files. -modpack.install.will_install=Will install the modpack: -modpack.save=Choose a location which you want to export the game files to. -modpack.save.task=Export the modpack modpack.export_error=Failed to export the modpack, maybe the format of your game directory is incorrect or failed to manage files. modpack.export_finished=Exporting the modpack finished. See modpack.included_launcher=The modpack has already included the launcher, you can publish it directly. modpack.not_included_launcher=Use the modpack by "import modpack". modpack.enter_name=Give this game a name which is your favorite. + +modpack.task.save=Export the modpack +modpack.task.install=Import the modpack +modpack.task.install.error=Failed to install the modpack, maybe the modpack file is incorrect or failed to manage files. +modpack.task.install.will=Will install the modpack: + modpack.wizard=Exporting the modpack wizard modpack.wizard.step.1=Basic options modpack.wizard.step.1.title=Set the basic options to the modpack. +modpack.wizard.step.initialization.include_launcher=Include the launcher +modpack.wizard.step.initialization.exported_version=The exported game version +modpack.wizard.step.initialization.save=Choose a location which you want to export the game files to +modpack.wizard.step.initialization.warning=Before making modpack, you should ensure that your game can launch successfully,
and that your Minecraft is release, not snapshot.
and that it is not allowed to add mods which is not allowed to distribute to the modpack. modpack.wizard.step.2=Files selection modpack.wizard.step.2.title=Choose the files you do not want to put in the modpack. modpack.wizard.step.3=Description modpack.wizard.step.3.title=Describe your modpack. + modpack.desc=Describe your modpack, including precautions, changlog, supporting Markdown(also supporting online pictures). modpack.incorrect_format.no_json=The format of the modpack is incorrect, pack.json is missing. modpack.incorrect_format.no_jar=The format of the modpack is incorrect, pack.json does not have attribute 'jar' modpack.cannot_read_version=Failed to gather the game version modpack.not_a_valid_location=Not a valid modpack location -modpack.warning=Before making modpack, you should ensure that your game can launch successfully,
and that your Minecraft is release, not snapshot.
and that it is not allowed to add mods which is not allowed to distribute to the modpack. modpack.name=Modpack Name modpack.not_a_valid_name=Not a valid modpack name diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties index 32c3e30a4..a86f9104f 100755 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties @@ -221,29 +221,34 @@ settings.test_game=Test game modpack=Mod pack modpack.choose=Choose a modpack zip file which you want to import. If you want to update the modpack, please enter the version you want to update. -modpack.install.task=Import the modpack -modpack.install_error=Failed to install the modpack, maybe the modpack file is incorrect or failed to manage files. -modpack.install.will_install=Will install the modpack: -modpack.save=Choose a location which you want to export the game files to. -modpack.save.task=Export the modpack modpack.export_error=Failed to export the modpack, maybe the format of your game directory is incorrect or failed to manage files. modpack.export_finished=Exporting the modpack finished. See modpack.included_launcher=The modpack has already included the launcher, you can publish it directly. modpack.not_included_launcher=Use the modpack by "import modpack". modpack.enter_name=Give this game a name which is your favorite. + +modpack.task.save=Export the modpack +modpack.task.install=Import the modpack +modpack.task.install.error=Failed to install the modpack, maybe the modpack file is incorrect or failed to manage files. +modpack.task.install.will=Will install the modpack: + modpack.wizard=Exporting the modpack wizard modpack.wizard.step.1=Basic options modpack.wizard.step.1.title=Set the basic options to the modpack. +modpack.wizard.step.initialization.include_launcher=Include the launcher +modpack.wizard.step.initialization.exported_version=The exported game version +modpack.wizard.step.initialization.save=Choose a location which you want to export the game files to +modpack.wizard.step.initialization.warning=Before making modpack, you should ensure that your game can launch successfully,
and that your Minecraft is release, not snapshot.
and that it is not allowed to add mods which is not allowed to distribute to the modpack. modpack.wizard.step.2=Files selection modpack.wizard.step.2.title=Choose the files you do not want to put in the modpack. modpack.wizard.step.3=Description modpack.wizard.step.3.title=Describe your modpack. + modpack.desc=Describe your modpack, including precautions, changlog, supporting Markdown(also supporting online pictures). modpack.incorrect_format.no_json=The format of the modpack is incorrect, pack.json is missing. modpack.incorrect_format.no_jar=The format of the modpack is incorrect, pack.json does not have attribute 'jar' modpack.cannot_read_version=Failed to gather the game version modpack.not_a_valid_location=Not a valid modpack location -modpack.warning=Before making modpack, you should ensure that your game can launch successfully,
and that your Minecraft is release, not snapshot.
and that it is not allowed to add mods which is not allowed to distribute to the modpack. modpack.name=Modpack Name modpack.not_a_valid_name=Not a valid modpack name diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang index c62d8d820..0602790a7 100755 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.lang @@ -221,29 +221,34 @@ settings.test_game=測試遊戲 modpack=懶人包 modpack.choose=選擇要導入的遊戲懶人包資料，如果您希望更新懶人包，请输入要更新的版本名 -modpack.install.task=導入懶人包 -modpack.install_error=安裝失敗，可能是懶人包格式不正確或操作資料失敗 -modpack.install.will_install=將會安裝懶人包： -modpack.save=選擇要導出到的遊戲懶人包位置 -modpack.save.task=導出懶人包 modpack.export_error=導出失敗，可能是您的遊戲資料夾格式不正確或操作資料失敗 modpack.export_finished=懶人包導出完成，参见 modpack.included_launcher=懶人包已包含啟動器，可直接發布 modpack.not_included_launcher=懶人包未包含啟動器，可使用本軟件的導入懶人包功能導入懶人包 modpack.enter_name=給遊戲起個你喜歡的名字 + +modpack.task.save=導出懶人包 +modpack.task.install=導入懶人包 +modpack.task.install.error=安裝失敗，可能是懶人包格式不正確或操作資料失敗 +modpack.task.install.will_install=將會安裝懶人包： + modpack.wizard=導出懶人包嚮導 modpack.wizard.step.1=基本設定 modpack.wizard.step.1.title=設置懶人包的主要信息 +modpack.wizard.step.initialization.include_launcher=包含啟動器 +modpack.wizard.step.initialization.exported_version=要導出的遊戲版本 +modpack.wizard.step.initialization.save=選擇要導出到的遊戲懶人包位置 +modpack.wizard.step.initialization.warning=在製作懶人包前,請您確認您選擇的版本可以正常啟動,
並保證您的Minecraft是正式版而非快照版,
而且不應當將不允許非官方途徑傳播的Mod、材質包等納入整合包。
懶人包會保存您目前的下載源設定 modpack.wizard.step.2=資料選擇 modpack.wizard.step.2.title=選中你不想加到懶人包中的資料(夾) modpack.wizard.step.3=懶人包描述 modpack.wizard.step.3.title=描述你要製作的懶人包。 + modpack.desc=描述你要製作的懶人包，比如懶人包注意事項和更新記錄，支持Markdown(圖片請用網路圖片)。 modpack.incorrect_format.no_json=懶人包格式錯誤，pack.json丟失 modpack.incorrect_format.no_jar=懶人包格式錯誤，pack.json丟失jar字段 modpack.cannot_read_version=讀取遊戲版本失敗 modpack.not_a_valid_location=不是一个有效懒人包位置 -modpack.warning=在製作懶人包前,請您確認您選擇的版本可以正常啟動,
並保證您的Minecraft是正式版而非快照版,
而且不應當將不允許非官方途徑傳播的Mod、材質包等納入整合包。
懶人包會保存您目前的下載源設定 modpack.name=懶人包名稱 modpack.not_a_valid_name=不是一个有效的懶人包名稱 diff --git a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties index 3e0886972..8b5be452b 100755 --- a/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties +++ b/HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_TW.properties @@ -221,29 +221,34 @@ settings.test_game=\u6e2c\u8a66\u904a\u6232 modpack=\u61f6\u4eba\u5305 modpack.choose=\u9078\u64c7\u8981\u5c0e\u5165\u7684\u904a\u6232\u61f6\u4eba\u5305\u8cc7\u6599\uff0c\u5982\u679c\u60a8\u5e0c\u671b\u66f4\u65b0\u61f6\u4eba\u5305\uff0c\u8bf7\u8f93\u5165\u8981\u66f4\u65b0\u7684\u7248\u672c\u540d -modpack.install.task=\u5c0e\u5165\u61f6\u4eba\u5305 -modpack.install_error=\u5b89\u88dd\u5931\u6557\uff0c\u53ef\u80fd\u662f\u61f6\u4eba\u5305\u683c\u5f0f\u4e0d\u6b63\u78ba\u6216\u64cd\u4f5c\u8cc7\u6599\u5931\u6557 -modpack.install.will_install=\u5c07\u6703\u5b89\u88dd\u61f6\u4eba\u5305\uff1a -modpack.save=\u9078\u64c7\u8981\u5c0e\u51fa\u5230\u7684\u904a\u6232\u61f6\u4eba\u5305\u4f4d\u7f6e -modpack.save.task=\u5c0e\u51fa\u61f6\u4eba\u5305 modpack.export_error=\u5c0e\u51fa\u5931\u6557\uff0c\u53ef\u80fd\u662f\u60a8\u7684\u904a\u6232\u8cc7\u6599\u593e\u683c\u5f0f\u4e0d\u6b63\u78ba\u6216\u64cd\u4f5c\u8cc7\u6599\u5931\u6557 modpack.export_finished=\u61f6\u4eba\u5305\u5c0e\u51fa\u5b8c\u6210\uff0c\u53c2\u89c1 modpack.included_launcher=\u61f6\u4eba\u5305\u5df2\u5305\u542b\u555f\u52d5\u5668\uff0c\u53ef\u76f4\u63a5\u767c\u5e03 modpack.not_included_launcher=\u61f6\u4eba\u5305\u672a\u5305\u542b\u555f\u52d5\u5668\uff0c\u53ef\u4f7f\u7528\u672c\u8edf\u4ef6\u7684\u5c0e\u5165\u61f6\u4eba\u5305\u529f\u80fd\u5c0e\u5165\u61f6\u4eba\u5305 modpack.enter_name=\u7d66\u904a\u6232\u8d77\u500b\u4f60\u559c\u6b61\u7684\u540d\u5b57 + +modpack.task.save=\u5c0e\u51fa\u61f6\u4eba\u5305 +modpack.task.install=\u5c0e\u5165\u61f6\u4eba\u5305 +modpack.task.install.error=\u5b89\u88dd\u5931\u6557\uff0c\u53ef\u80fd\u662f\u61f6\u4eba\u5305\u683c\u5f0f\u4e0d\u6b63\u78ba\u6216\u64cd\u4f5c\u8cc7\u6599\u5931\u6557 +modpack.task.install.will_install=\u5c07\u6703\u5b89\u88dd\u61f6\u4eba\u5305\uff1a + modpack.wizard=\u5c0e\u51fa\u61f6\u4eba\u5305\u56ae\u5c0e modpack.wizard.step.1=\u57fa\u672c\u8a2d\u5b9a modpack.wizard.step.1.title=\u8a2d\u7f6e\u61f6\u4eba\u5305\u7684\u4e3b\u8981\u4fe1\u606f +modpack.wizard.step.initialization.include_launcher=\u5305\u542b\u555f\u52d5\u5668 +modpack.wizard.step.initialization.exported_version=\u8981\u5c0e\u51fa\u7684\u904a\u6232\u7248\u672c +modpack.wizard.step.initialization.save=\u9078\u64c7\u8981\u5c0e\u51fa\u5230\u7684\u904a\u6232\u61f6\u4eba\u5305\u4f4d\u7f6e +modpack.wizard.step.initialization.warning=\u5728\u88fd\u4f5c\u61f6\u4eba\u5305\u524d,\u8acb\u60a8\u78ba\u8a8d\u60a8\u9078\u64c7\u7684\u7248\u672c\u53ef\u4ee5\u6b63\u5e38\u555f\u52d5,
\u4e26\u4fdd\u8b49\u60a8\u7684Minecraft\u662f\u6b63\u5f0f\u7248\u800c\u975e\u5feb\u7167\u7248,
\u800c\u4e14\u4e0d\u61c9\u7576\u5c07\u4e0d\u5141\u8a31\u975e\u5b98\u65b9\u9014\u5f91\u50b3\u64ad\u7684Mod\u3001\u6750\u8cea\u5305\u7b49\u7d0d\u5165\u6574\u5408\u5305\u3002
\u61f6\u4eba\u5305\u6703\u4fdd\u5b58\u60a8\u76ee\u524d\u7684\u4e0b\u8f09\u6e90\u8a2d\u5b9a modpack.wizard.step.2=\u8cc7\u6599\u9078\u64c7 modpack.wizard.step.2.title=\u9078\u4e2d\u4f60\u4e0d\u60f3\u52a0\u5230\u61f6\u4eba\u5305\u4e2d\u7684\u8cc7\u6599(\u593e) modpack.wizard.step.3=\u61f6\u4eba\u5305\u63cf\u8ff0 modpack.wizard.step.3.title=\u63cf\u8ff0\u4f60\u8981\u88fd\u4f5c\u7684\u61f6\u4eba\u5305\u3002 + modpack.desc=\u63cf\u8ff0\u4f60\u8981\u88fd\u4f5c\u7684\u61f6\u4eba\u5305\uff0c\u6bd4\u5982\u61f6\u4eba\u5305\u6ce8\u610f\u4e8b\u9805\u548c\u66f4\u65b0\u8a18\u9304\uff0c\u652f\u6301Markdown(\u5716\u7247\u8acb\u7528\u7db2\u8def\u5716\u7247)\u3002 modpack.incorrect_format.no_json=\u61f6\u4eba\u5305\u683c\u5f0f\u932f\u8aa4\uff0cpack.json\u4e1f\u5931 modpack.incorrect_format.no_jar=\u61f6\u4eba\u5305\u683c\u5f0f\u932f\u8aa4\uff0cpack.json\u4e1f\u5931jar\u5b57\u6bb5 modpack.cannot_read_version=\u8b80\u53d6\u904a\u6232\u7248\u672c\u5931\u6557 modpack.not_a_valid_location=\u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u61d2\u4eba\u5305\u4f4d\u7f6e -modpack.warning=\u5728\u88fd\u4f5c\u61f6\u4eba\u5305\u524d,\u8acb\u60a8\u78ba\u8a8d\u60a8\u9078\u64c7\u7684\u7248\u672c\u53ef\u4ee5\u6b63\u5e38\u555f\u52d5,
\u4e26\u4fdd\u8b49\u60a8\u7684Minecraft\u662f\u6b63\u5f0f\u7248\u800c\u975e\u5feb\u7167\u7248,
\u800c\u4e14\u4e0d\u61c9\u7576\u5c07\u4e0d\u5141\u8a31\u975e\u5b98\u65b9\u9014\u5f91\u50b3\u64ad\u7684Mod\u3001\u6750\u8cea\u5305\u7b49\u7d0d\u5165\u6574\u5408\u5305\u3002
\u61f6\u4eba\u5305\u6703\u4fdd\u5b58\u60a8\u76ee\u524d\u7684\u4e0b\u8f09\u6e90\u8a2d\u5b9a modpack.name=\u61f6\u4eba\u5305\u540d\u7a31 modpack.not_a_valid_name=\u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u61f6\u4eba\u5305\u540d\u7a31