From 676611ed6f4b1f9966ff321f065557351d567eb0 Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Tue, 25 Jan 2022 03:13:34 +0100
Subject: [PATCH 1/2] Improve GitHub issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.yaml         | 10 +++++++++-
 .github/ISSUE_TEMPLATE/installation_issue.yaml |  8 ++++++++
 .github/ISSUE_TEMPLATE/performance_issue.yaml  | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 1865c679..acee8898 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -18,6 +18,14 @@ body:
         - label: >
             I have pulled the latest version of the main branch of DarkflameServer and have confirmed that the issue exists there.
           required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: DarkflameServer Version
+      description: >
+        DarkflameServer version or commit SHA
+    validations:
+      required: true
   - type: textarea
     id: problem
     attributes:
@@ -29,7 +37,7 @@ body:
   - type: textarea
     id: reproduction
     attributes:
-      label: Reproduction steps
+      label: Reproduction Steps
       description: >
         Please provide a concise list of steps needed to reproduce this issue.
     validations:
diff --git a/.github/ISSUE_TEMPLATE/installation_issue.yaml b/.github/ISSUE_TEMPLATE/installation_issue.yaml
index 2fd9a84f..84478ea0 100644
--- a/.github/ISSUE_TEMPLATE/installation_issue.yaml
+++ b/.github/ISSUE_TEMPLATE/installation_issue.yaml
@@ -12,6 +12,14 @@ body:
         - label: >
             I have read the [installation guide](https://github.com/DarkflameUniverse/DarkflameServer/blob/main/README.md).
           required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: DarkflameServer Version
+      description: >
+        DarkflameServer version or commit SHA
+    validations:
+      required: true
   - type: dropdown
     id: platform
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/performance_issue.yaml b/.github/ISSUE_TEMPLATE/performance_issue.yaml
index 420a5381..8e712741 100644
--- a/.github/ISSUE_TEMPLATE/performance_issue.yaml
+++ b/.github/ISSUE_TEMPLATE/performance_issue.yaml
@@ -15,6 +15,22 @@ body:
         - label: >
             I have pulled the latest version of the main branch of DarkflameServer and have confirmed that the issue exists there.
           required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: DarkflameServer Version
+      description: >
+        DarkflameServer version or commit SHA
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: >
+        Please include the environment you're running DarkflameServer on (for example: Windows, macOS, Ubuntu, WSL, etc), available memory, number of CPU cores.
+    validations:
+      required: true
   - type: textarea
     id: example
     attributes:

From 42e20d6db5273e405df7f42e7f3ec28792ed0ed0 Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Sat, 5 Feb 2022 22:51:44 +0100
Subject: [PATCH 2/2] Explain in issue templates how to get Git commit SHA

---
 .github/ISSUE_TEMPLATE/bug_report.yaml         | 2 +-
 .github/ISSUE_TEMPLATE/installation_issue.yaml | 2 +-
 .github/ISSUE_TEMPLATE/performance_issue.yaml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index acee8898..b91a920d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -23,7 +23,7 @@ body:
     attributes:
       label: DarkflameServer Version
       description: >
-        DarkflameServer version or commit SHA
+        DarkflameServer version or commit SHA (can be obtained with `git rev-parse --short HEAD`)
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/installation_issue.yaml b/.github/ISSUE_TEMPLATE/installation_issue.yaml
index 84478ea0..43211e62 100644
--- a/.github/ISSUE_TEMPLATE/installation_issue.yaml
+++ b/.github/ISSUE_TEMPLATE/installation_issue.yaml
@@ -17,7 +17,7 @@ body:
     attributes:
       label: DarkflameServer Version
       description: >
-        DarkflameServer version or commit SHA
+        DarkflameServer version or commit SHA (can be obtained with `git rev-parse --short HEAD`)
     validations:
       required: true
   - type: dropdown
diff --git a/.github/ISSUE_TEMPLATE/performance_issue.yaml b/.github/ISSUE_TEMPLATE/performance_issue.yaml
index 8e712741..b5ec2bcb 100644
--- a/.github/ISSUE_TEMPLATE/performance_issue.yaml
+++ b/.github/ISSUE_TEMPLATE/performance_issue.yaml
@@ -20,7 +20,7 @@ body:
     attributes:
       label: DarkflameServer Version
       description: >
-        DarkflameServer version or commit SHA
+        DarkflameServer version or commit SHA (can be obtained with `git rev-parse --short HEAD`)
     validations:
       required: true
   - type: textarea