From 748d48e4d7b358791ea1163002872d92103ec9fe Mon Sep 17 00:00:00 2001 From: mingjun97 Date: Wed, 11 May 2022 15:53:18 +0800 Subject: [PATCH 1/4] Update Issue template to ask for version (#799) --- .github/ISSUE_TEMPLATE/a_issue_report.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/a_issue_report.md b/.github/ISSUE_TEMPLATE/a_issue_report.md index 9cc1b246e..f91283bdc 100644 --- a/.github/ISSUE_TEMPLATE/a_issue_report.md +++ b/.github/ISSUE_TEMPLATE/a_issue_report.md @@ -12,8 +12,12 @@ assignees: '' **Describe the issue** -**Which branch did you use?** - +**Which version did you use?** + + **Screenshots** From 51a68ba70c224d5d0ccd1963f8f277843f54b957 Mon Sep 17 00:00:00 2001 From: liamsegura Date: Mon, 9 May 2022 16:09:55 +0100 Subject: [PATCH 2/4] Fixed grammar in README.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bbef2f834..99d80c65b 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ You can find the output jar in the root of the project folder. ## Commands -You might want to use this command (`java -jar grasscutter.jar -handbook`) in a cmd that is in the grasscutter folder. It will create a handbook file (GM Handbook.txt) where you can find the item IDs for stuff you want +You might want to use this command (`java -jar grasscutter.jar -handbook`) in a cmd that is in the grasscutter folder. It will create a handbook file (GM Handbook.txt) where you can find the item IDs for stuff you want. You may want to use this command (`java -jar grasscutter.jar -gachamap`) to generate a mapping file for the gacha record subsystem. The file will be generated to `GRASSCUTTER_RESOURCE/gcstatic` folder. Otherwise you may only see number IDs in the gacha record page. @@ -144,7 +144,7 @@ There is a dummy user named "Server" in every player's friends list that you can ### Bonus - Teleporting - - When you want to teleport to somewhere, use the in-game marking function on Map. + - When you want to teleport somewhere, use the in-game marking function on the map. - Mark a point on the map using the fish hook marking (the last one.) - (Optional) rename the map marker to a number to override the default Y coordinate (height, default 300.) - Confirm and close the map. @@ -153,7 +153,6 @@ There is a dummy user named "Server" in every player's friends list that you can # Quick Troubleshooting * If compiling wasn't successful, please check your JDK installation (JDK 17 and validated JDK's bin PATH variable) -* My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if using - Fiddler make sure it running on another port except 8888 +* My client doesn't connect, doesn't login, 4206, etc... - Your proxy daemon setup is most likely *the issue*, if you are using Fiddler, make sure it running on another port other than 8888 * Startup sequence: Mongodb > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game From 467bf712e7c48023d4195ec8130e536f58ec9a4c Mon Sep 17 00:00:00 2001 From: lunatic <56441863+lunaticwhat@users.noreply.github.com> Date: Tue, 17 May 2022 06:42:00 -0700 Subject: [PATCH 3/4] Issue template updated no more headache (#965) --- .github/ISSUE_TEMPLATE/a_bug_report.md | 32 +++++++++++++++++++ .github/ISSUE_TEMPLATE/a_issue_report.md | 27 ---------------- .github/ISSUE_TEMPLATE/b_bug_report.md | 21 ------------ ...eature_request.md => b_feature_request.md} | 0 .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/ISSUE_TEMPLATE/custom.md | 10 ------ .../java/emu/grasscutter/BuildConfig.java | 7 ++++ 7 files changed, 40 insertions(+), 59 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/a_bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/a_issue_report.md delete mode 100644 .github/ISSUE_TEMPLATE/b_bug_report.md rename .github/ISSUE_TEMPLATE/{c_feature_request.md => b_feature_request.md} (100%) delete mode 100644 .github/ISSUE_TEMPLATE/custom.md create mode 100644 src/main/java/emu/grasscutter/BuildConfig.java diff --git a/.github/ISSUE_TEMPLATE/a_bug_report.md b/.github/ISSUE_TEMPLATE/a_bug_report.md new file mode 100644 index 000000000..273c04034 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/a_bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a bug report to help us improve Grasscutter +title: '[Bug] ' +labels: 'bug' +assignees: '' + +--- + + + + + + +**Did you look for other closed issues that have the same problem?** + + +**Describe the bug** + + +**Which branch did you use?** + + + +**Screenshots** + + +**Additional context** + diff --git a/.github/ISSUE_TEMPLATE/a_issue_report.md b/.github/ISSUE_TEMPLATE/a_issue_report.md deleted file mode 100644 index f91283bdc..000000000 --- a/.github/ISSUE_TEMPLATE/a_issue_report.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: Issues -about: Create an issue if you need any help -title: '[Issue] ' -labels: 'help wanted, question' -assignees: '' - ---- -**Did you look for other closed issues that have the same problem?** - - -**Describe the issue** - - -**Which version did you use?** - - - -**Screenshots** - - -**Additional context** - - diff --git a/.github/ISSUE_TEMPLATE/b_bug_report.md b/.github/ISSUE_TEMPLATE/b_bug_report.md deleted file mode 100644 index 8805c4ba4..000000000 --- a/.github/ISSUE_TEMPLATE/b_bug_report.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: Bug report -about: Create a bug report to help us improve Grasscutter -title: '[Bug] ' -labels: 'bug' -assignees: '' - ---- - - -**Describe the bug** - - -**Which branch did you use?** - - -**Screenshots** - - -**Additional context** - diff --git a/.github/ISSUE_TEMPLATE/c_feature_request.md b/.github/ISSUE_TEMPLATE/b_feature_request.md similarity index 100% rename from .github/ISSUE_TEMPLATE/c_feature_request.md rename to .github/ISSUE_TEMPLATE/b_feature_request.md diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 0c1065290..f117cab00 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,5 +2,5 @@ blank_issues_enabled: false contact_links: - name: Grasscutter Discord url: https://discord.gg/T5vZU6UyeG - about: For support, discuss and and other things with Grasscutter. + about: If you are looking for help while using Grasscutter, please visit the Discord server. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md deleted file mode 100644 index 48d5f81fa..000000000 --- a/.github/ISSUE_TEMPLATE/custom.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Custom issue template -about: Describe this issue template's purpose here. -title: '' -labels: '' -assignees: '' - ---- - - diff --git a/src/main/java/emu/grasscutter/BuildConfig.java b/src/main/java/emu/grasscutter/BuildConfig.java new file mode 100644 index 000000000..9ba41e55f --- /dev/null +++ b/src/main/java/emu/grasscutter/BuildConfig.java @@ -0,0 +1,7 @@ + + package emu.grasscutter; + public class BuildConfig { + public static final String VERSION = "1.1.2-dev"; + public static final String GIT_HASH = "b0aa294"; + } + \ No newline at end of file From 304b9cb8edbd2b046ee0a284602e9a783fb310e8 Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Tue, 7 Jun 2022 03:27:43 -0700 Subject: [PATCH 4/4] Delete BuildConfig.java --- src/main/java/emu/grasscutter/BuildConfig.java | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/main/java/emu/grasscutter/BuildConfig.java diff --git a/src/main/java/emu/grasscutter/BuildConfig.java b/src/main/java/emu/grasscutter/BuildConfig.java deleted file mode 100644 index 9ba41e55f..000000000 --- a/src/main/java/emu/grasscutter/BuildConfig.java +++ /dev/null @@ -1,7 +0,0 @@ - - package emu.grasscutter; - public class BuildConfig { - public static final String VERSION = "1.1.2-dev"; - public static final String GIT_HASH = "b0aa294"; - } - \ No newline at end of file