Merge branch 'main' into dev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,16 +7,19 @@ body:
   - type: markdown
     attributes:
       value: |
-        > [!WARNING]
+        ## READ BEFORE SUBMITTING AN ISSUE
-        > ## ONLY OPEN AN ISSUE IF:
+        ![Flowchart](https://github.com/user-attachments/assets/36fe18ba-52c3-4a5d-a721-edd25af47381)
-        > * You are using an up-to-date version of VendroidEnhanced
+        <details>
-        > * You **did not** edit the Vencord location in app settings
+             <summary>Flowchart but in text format</summary>
-        > * You are using Discord Stable, not PTB or Canary.
+             
-        > * You **could not** reproduce the issue on:
+              Only open an issue if:
-        >   * Vencord Web, Vesktop, or ArmCord, on a computer
+              * You are using an up-to-date version of VendroidEnhanced
-        >   * The Discord mobile website (`discord.com/app`) on a mobile browser WITHOUT VENCORD
+              * You did not edit the Vencord location in app settings
-        >
+              * You are using Discord Stable, not PTB or Canary.
-        > **Your issue will get closed and you will possibly be blocked from the repository if you cannot read this!**
+              * You could not reproduce the issue on:
+              * Vencord Web, Vesktop, or ArmCord, on a computer
+              * The Discord mobile website (discord.com/app) on a mobile browser WITHOUT VENCORD
+        </details>
   
   - type: input
     id: discord
@@ -67,4 +70,4 @@ body:
         - label: I am using Discord Stable or tried on Stable and this bug happens there as well
           required: true
         - label: I have read the requirements for opening an issue above
-          required: true
+          required: true

.github/workflows/android.yml

@@ -9,7 +9,8 @@ on:
     branches:
       - '*'
       - '!main'
-
+  pull_request:
+  merge_group:
   workflow_dispatch:
 
 jobs:

renovate.json

@@ -2,5 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended"
-  ]
+  ],
+  "baseBranches": ["dev"]
 }