Merge branch 'beta' into toxic_spikes

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,7 @@
 name: Bug Report
 description: Create a report to help us improve
 title: "[Bug] "
-labels: ["Bug"]
+labels: ["Bug", "Triage"]
 body:
   - type: markdown
     attributes:
@@ -19,21 +19,12 @@ body:
       value: |
         ---
   - type: textarea
-    id: session-file
+    id: repro
     attributes:
-      label: Session export file
+      label: Reproduction
-      description: Open Menu → ManageData → Export Session → Select slot. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
+      description: Describe the steps to reproduce this bug. If applicable attach user/session data at the bottom
-      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
     validations:
-      required: false
+      required: true
-  - type: textarea
-    id: data-file
-    attributes:
-      label: User data export file
-      description: Open Menu → ManageData → Export Data. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
-    validations:
-      required: false
   - type: markdown
     attributes:
       value: |
@@ -60,48 +51,20 @@ body:
     attributes:
       value: |
         ---
-  - type: dropdown
+  - type: textarea
-    id: os
+    id: session-file
     attributes:
-      label: What OS did you observe the bug on?
+      label: Session export file
-      multiple: true
+      description: Open Menu → ManageData → Export Session → Select slot. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-      options:
+      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
-        - PC/Windows
-        - Mac/OSX
-        - Linux
-        - iOS
-        - Android
-        - Other
-    validations:
-      required: true
-  - type: input
-    id: os-other
-    attributes:
-      label: If other please specify
     validations:
       required: false
-  - type: markdown
+  - type: textarea
+    id: data-file
     attributes:
-      value: |
+      label: User data export file
-        ---
+      description: Open Menu → ManageData → Export Data. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-  - type: dropdown
+      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
-    id: browser
-    attributes:
-      label: Which browser do you use?
-      multiple: true
-      options:
-        - Chrome
-        - Firefox
-        - Safari
-        - Edge
-        - Opera
-        - Other
-    validations:
-      required: true
-  - type: input
-    id: browser-other
-    attributes:
-      label: If other please specify
     validations:
       required: false
   - type: markdown

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,7 @@
 name: Feature Request
 description: Suggest an idea for this project
 title: "[Feature] "
-labels: ["Enhancement"]
+labels: ["Enhancement", "Triage"]
 body:
   - type: markdown
     attributes: