Upcoming merge

.all-contributorsrc

@@ -0,0 +1,272 @@
+{
+  "projectName": "pokeemerald-expansion",
+  "projectOwner": "rh-hideout",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "CREDITS.md"
+  ],
+  "imageSize": 100,
+  "commit": true,
+  "commitConvention": "none",
+  "contributors": [
+    {
+      "login": "AgustinGDLV",
+      "name": "AgustinGDLV",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103095241?v=4",
+      "profile": "https://github.com/AgustinGDLV",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "AlexOn1ine",
+      "name": "Alex",
+      "avatar_url": "https://avatars.githubusercontent.com/u/93446519?v=4",
+      "profile": "https://github.com/AlexOn1ine",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "Bassoonian",
+      "name": "Bassoonian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16993385?v=4",
+      "profile": "https://github.com/Bassoonian",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "DizzyEggg",
+      "name": "DizzyEggg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16259973?v=4",
+      "profile": "https://github.com/DizzyEggg",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "ghoulslash",
+      "name": "ghoulslash",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41651341?v=4",
+      "profile": "https://github.com/ghoulslash",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "hedara90",
+      "name": "hedara90",
+      "avatar_url": "https://avatars.githubusercontent.com/u/149414898?v=4",
+      "profile": "https://github.com/hedara90",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "mrgriffin",
+      "name": "Martin Griffin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/838573?v=4",
+      "profile": "http://www.martin-griffin.com/",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "Pawkkie",
+      "name": "Pawkkie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61265402?v=4",
+      "profile": "https://github.com/Pawkkie",
+      "contributions": [
+        "maintenance",
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "SBird1337",
+      "name": "Philipp AUER",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3799173?v=4",
+      "profile": "https://github.com/SBird1337",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "tertu-m",
+      "name": "tertu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/836640?v=4",
+      "profile": "https://github.com/tertu-m",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "pkmnsnfrn",
+      "name": "psf",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77138753?v=4",
+      "profile": "https://linktr.ee/pkmnsnfrn",
+      "contributions": [
+        "maintenance",
+        "code"
+      ]
+    },
+    {
+      "login": "wiz1989",
+      "name": "wiz1989",
+      "avatar_url": "https://avatars.githubusercontent.com/u/80073265?v=4",
+      "profile": "https://github.com/wiz1989",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "PCG06",
+      "name": "PCG",
+      "avatar_url": "https://avatars.githubusercontent.com/u/75729017?v=4",
+      "profile": "https://github.com/PCG06",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kittenchilly",
+      "name": "kittenchilly",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23617175?v=4",
+      "profile": "https://github.com/kittenchilly",
+      "contributions": [
+        "code",
+        "research",
+        "data"
+      ]
+    },
+    {
+      "login": "ExpoSeed",
+      "name": "ExpoSeed",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43502820?v=4",
+      "profile": "https://github.com/ExpoSeed",
+      "contributions": [
+        "code",
+        "maintenance",
+        "review"
+      ]
+    },
+    {
+      "login": "LinathanZel",
+      "name": "Linathan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35115312?v=4",
+      "profile": "https://github.com/LinathanZel",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AsparagusEduardo",
+      "name": "Eduardo Quezada",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2904965?v=4",
+      "profile": "https://github.com/AsparagusEduardo",
+      "contributions": [
+        "code",
+        "data",
+        "doc",
+        "infra",
+        "maintenance",
+        "projectManagement",
+        "promotion",
+        "research",
+        "review",
+        "test",
+        "tutorial",
+        "userTesting"
+      ]
+    },
+    {
+      "login": "khbsd",
+      "name": "khbsd",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26092020?v=4",
+      "profile": "https://github.com/khbsd",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "Cafeei",
+      "name": "Cafe",
+      "avatar_url": "https://avatars.githubusercontent.com/u/46283144?v=4",
+      "profile": "https://github.com/Cafeei",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "agsmgmaster64",
+      "name": "agsmgmaster64",
+      "avatar_url": "https://avatars.githubusercontent.com/u/67435611?v=4",
+      "profile": "https://github.com/agsmgmaster64",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "RubyRaven6",
+      "name": "Ruby",
+      "avatar_url": "https://avatars.githubusercontent.com/u/178652077?v=4",
+      "profile": "https://github.com/RubyRaven6",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "mudskipper13",
+      "name": "mudskipper13",
+      "avatar_url": "https://avatars.githubusercontent.com/u/105766191?v=4",
+      "profile": "https://github.com/mudskipper13",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "surskitty",
+      "name": "surskitty",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1383512?v=4",
+      "profile": "https://github.com/surskitty",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "grintoul1",
+      "name": "grintoul",
+      "avatar_url": "https://avatars.githubusercontent.com/u/166724814?v=4",
+      "profile": "https://github.com/grintoul1",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bassforte123",
+      "name": "bassforte123",
+      "avatar_url": "https://avatars.githubusercontent.com/u/130828119?v=4",
+      "profile": "https://github.com/bassforte123",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "linkToUsage": true,
+  "commitType": "docs"
+}

.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml

@@ -6,7 +6,7 @@ body:
     attributes:
       value: |
         Please fill in all fields with as many details as possible.
-  - type: textarea
+        Once your bug is posted, make sure you and your collaborators are added to `CREDITS.md` by [tagging the bot on GitHub](https://github.com/rh-hideout/pokeemerald-expansion/wiki/CREDITS.md-Frequently-Asked-Questions). EVERY contribution matters, even reporting bugs!
     id: description
     attributes:
       label: Description
@@ -42,16 +42,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using?
       options:
-        - 1.11.2 (Latest release)
+        - 1.12.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.11.4
+        - 1.11.3
+        - 1.11.2
         - 1.11.1
         - 1.11.0
-        - 1.10.3
-        - 1.10.2
-        - 1.10.1
-        - 1.10.0
-        - pre-1.10.0
+        - pre-1.11.0
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml

@@ -6,6 +6,7 @@ body:
     attributes:
       value: |
         Please fill in all fields with as many details as possible.
+        Once your bug is posted, make sure you and your collaborators are added to `CREDITS.md` by [tagging the bot on GitHub](https://github.com/rh-hideout/pokeemerald-expansion/wiki/CREDITS.md-Frequently-Asked-Questions). EVERY contribution matters, even reporting bugs!
   - type: textarea
     id: description
     attributes:
@@ -42,16 +43,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using?
       options:
-        - 1.11.2 (Latest release)
+        - 1.12.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.11.4
+        - 1.11.3
+        - 1.11.2
         - 1.11.1
         - 1.11.0
-        - 1.10.3
-        - 1.10.2
-        - 1.10.1
-        - 1.10.0
-        - pre-1.10.0
+        - pre-1.11.0
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/03_feature_requests.yaml

@@ -6,6 +6,8 @@ body:
     attributes:
       value: |
         Please fill in all fields with as many details as possible.
+        Once your feature request is posted, make sure you and your collaborators are added to `CREDITS.md` by [tagging the bot on GitHub](https://github.com/rh-hideout/pokeemerald-expansion/wiki/CREDITS.md-Frequently-Asked-Questions). EVERY contribution matters, even requesting issues!
+
   - type: textarea
     id: behavior
     attributes:

.github/ISSUE_TEMPLATE/04_other_errors.yaml

@@ -6,6 +6,7 @@ body:
     attributes:
       value: |
         Please fill in all fields with as many details as possible.
+        Once your bug is posted, make sure you and your collaborators are added to `CREDITS.md` by [tagging the bot on GitHub](https://github.com/rh-hideout/pokeemerald-expansion/wiki/CREDITS.md-Frequently-Asked-Questions). EVERY contribution matters, even creating issues!
   - type: textarea
     id: description
     attributes:
@@ -42,16 +43,14 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using?
       options:
-        - 1.11.2 (Latest release)
+        - 1.12.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.11.4
+        - 1.11.3
         - 1.11.1
         - 1.11.0
-        - 1.10.3
-        - 1.10.2
-        - 1.10.1
-        - 1.10.0
-        - pre-1.10.0
+        - pre-1.11.0
     validations:
       required: true
   - type: input

.github/pull_request_template.md

@@ -21,11 +21,11 @@
 ## Issue(s) that this PR fixes
 <!-- Format: "Fixes #2345, fixes #4523, closes #2222." Remove this section if not applicable.-->
 
-## People who collaborated with me in this PR
-<!-- Credit anyone who helped with this PR. -->
-<!-- Use their GitHub tag if they have one (or add "@/" at the start if they don't). The line must start with @. -->
-<!-- Eg.: "@Lunos for sprites, @/Masuda for support" -->
-<!--- Remove this section if not applicable. --->
+<!-- CREDITS -->
+<!-- Once your PR is submitted, leave a comment asking the bot to add you to the credits. -->
+<!-- If anybody helped with this PR, please encourage them to comment on your PR and ask the bot to add them to the credits. -->
+<!-- EVERY contribution matters! -->
+<!-- https://github.com/rh-hideout/pokeemerald-expansion/wiki/CREDITS.md-Frequently-Asked-Questions -->
 
 ## Feature(s) this PR does NOT handle:
 <!-- If this PR contains any unfinished and non-blocking work, please list them here for clarity. -->
@@ -36,6 +36,6 @@
 <!--- Remove this section if not applicable. --->
 
 ## Discord contact info
-<!-- Add your Discord username for any follow-up questions (e.g., Lunos#1234). -->
-<!--- Remove this section if not applicable. --->
+<!-- Add your Discord username for any follow-up questions (e.g., pcg06). -->
+<!-- If you have created a discussion thread, this is a good place to link it. -->
 <!--- Contributors must join https://discord.gg/6CzjAG6GZk -->