solve conflics

rh-hideout · Aug 7, 2023 · 8ee3a3c · 8ee3a3c
2 parents 5167b01 + 34d38bd
commit 8ee3a3c
Show file tree

Hide file tree

Showing 80 changed files with 3,249 additions and 1,807 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -1,50 +1,50 @@
-name: ⚔️ Battle Engine mechanical bugs 🐛
-description: File a bug report related to battle mechanic, be it moves, abilities and/or items.
-labels: ["bug", "status: unconfirmed", "category: battle-mechanic"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill in all required fields with as many details as possible.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Describe the issue you are experiencing. 
-        Attach images/videos if possible.
-      placeholder: |
-        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
-    validations:
-      required: true
-  - type: dropdown
-    id: version
-    attributes:
-      label: Version
-      description: What version of pokeemerald-expansion are you using as a base?
-      options:
-        - 1.5.1 (Default)
-        - upcoming (Edge)
-        - 1.5.0
-        - 1.4.3
-        - 1.4.2
-        - 1.4.1
-        - 1.4.0
-        - pre-1.4.0
-    validations:
-      required: true
-  - type: input
-    id: upcomingversion
-    attributes:
-      label: Upcoming Version
-      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
-    validations:
-      required: false
-  - type: input
-    id: contact
-    attributes:
-      label: Discord contact info
-      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
-      placeholder: ex. Lunos#4026
-    validations:
-      required: false
+name: ⚔️ Battle Engine mechanical bugs 🐛
+description: File a bug report related to battle mechanic, be it moves, abilities and/or items.
+labels: ["bug", "status: unconfirmed", "category: battle-mechanic"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.5.1 (Default)
+        - upcoming (Edge)
+        - 1.5.0
+        - 1.4.3
+        - 1.4.2
+        - 1.4.1
+        - 1.4.0
+        - pre-1.4.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming Version
+      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -1,50 +1,50 @@
-name: 🧠 Battle AI bugs 🐛
-description: File a bug report related to battle AI.
-labels: ["bug", "status: unconfirmed", "category: battle-ai"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill in all required fields with as many details as possible.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Describe the issue you are experiencing. 
-        Attach images/videos if possible.
-      placeholder: |
-        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
-    validations:
-      required: true
-  - type: dropdown
-    id: version
-    attributes:
-      label: Version
-      description: What version of pokeemerald-expansion are you using as a base?
-      options:
-        - 1.5.1 (Default)
-        - upcoming (Edge)
-        - 1.5.0
-        - 1.4.3
-        - 1.4.2
-        - 1.4.1
-        - 1.4.0
-        - pre-1.4.0
-    validations:
-      required: true
-  - type: input
-    id: upcomingversion
-    attributes:
-      label: Upcoming Version
-      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
-    validations:
-      required: false
-  - type: input
-    id: contact
-    attributes:
-      label: Discord contact info
-      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
-      placeholder: ex. Lunos#4026
-    validations:
-      required: false
+name: 🧠 Battle AI bugs 🐛
+description: File a bug report related to battle AI.
+labels: ["bug", "status: unconfirmed", "category: battle-ai"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.5.1 (Default)
+        - upcoming (Edge)
+        - 1.5.0
+        - 1.4.3
+        - 1.4.2
+        - 1.4.1
+        - 1.4.0
+        - pre-1.4.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming Version
+      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/03_feature_requests.yaml b/.github/ISSUE_TEMPLATE/03_feature_requests.yaml
@@ -1,27 +1,27 @@
-name: 🙏 Feature Request 🙏
-description: Do you want a feature to be added to the Expansion? Let us know!
-labels: ["feature-request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill in all required fields with as many details as possible.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Describe the issue you are experiencing. 
-        Attach images/videos if possible.
-      placeholder: |
-        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
-    validations:
-      required: true
-  - type: input
-    id: contact
-    attributes:
-      label: Discord contact info
-      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
-      placeholder: ex. Lunos#4026
-    validations:
-      required: false
+name: 🙏 Feature Request 🙏
+description: Do you want a feature to be added to the Expansion? Let us know!
+labels: ["feature-request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -1,50 +1,50 @@
-name: 💾 Other errors 🖥️
-description: Everything else that doesn't fit in the above categories.
-labels: ["bug", "status: unconfirmed"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please fill in all required fields with as many details as possible.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Describe the issue you are experiencing. 
-        Attach images/videos if possible.
-      placeholder: |
-        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
-    validations:
-      required: true
-  - type: dropdown
-    id: version
-    attributes:
-      label: Version
-      description: What version of pokeemerald-expansion are you using as a base?
-      options:
-        - 1.5.1 (Default)
-        - upcoming (Edge)
-        - 1.5.0
-        - 1.4.3
-        - 1.4.2
-        - 1.4.1
-        - 1.4.0
-        - pre-1.4.0
-    validations:
-      required: true
-  - type: input
-    id: upcomingversion
-    attributes:
-      label: Upcoming Version
-      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
-    validations:
-      required: false
-  - type: input
-    id: contact
-    attributes:
-      label: Discord contact info
-      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
-      placeholder: ex. Lunos#4026
-    validations:
-      required: false
+name: 💾 Other errors 🖥️
+description: Everything else that doesn't fit in the above categories.
+labels: ["bug", "status: unconfirmed"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill in all required fields with as many details as possible.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Describe the issue you are experiencing. 
+        Attach images/videos if possible.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of pokeemerald-expansion are you using as a base?
+      options:
+        - 1.5.1 (Default)
+        - upcoming (Edge)
+        - 1.5.0
+        - 1.4.3
+        - 1.4.2
+        - 1.4.1
+        - 1.4.0
+        - pre-1.4.0
+    validations:
+      required: true
+  - type: input
+    id: upcomingversion
+    attributes:
+      label: Upcoming Version
+      description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
+    validations:
+      required: false
+  - type: input
+    id: contact
+    attributes:
+      label: Discord contact info
+      description: Provide your Discord tag here so we can contact you in case we need more details. Be sure to join our server ([here](https://discord.gg/6CzjAG6GZk)).
+      placeholder: ex. Lunos#4026
+    validations:
+      required: false