Merge 0ec55b125eb5a859a1d5a95eec302e17b4ef03d4 into 91d913a261ab696ca7a14612d813b9267c089ca5

feat: redo bug issues

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,36 @@
+name: Bug report
+title: '[bug]: '
+labels: ['bug']
+description: Create a report to help us improve
+body:
+ - type: markdown
+   attributes:
+      value: |
+        Thank you for coming here to submit a bug report. We care about anything from big to small relating to MHSF, making a better experience for you and others.
+
+        Try and be as descriptive as possible & type in a way thats able to understood by other contributors.
+ - type: textarea
+   attributes:
+     label: Current and Expected Behavior
+     description: What are you experiencing right now, and what did you expect to happen? 
+     placeholder: I was trying to do XYZ, however X happened instead of Y.
+   validations:
+     required: true
+ - type: textarea
+   attributes:
+     label: To Reproduce
+     description: If this is self-explanatory with information above, keep this blank.
+     placeholder: |
+       1. Open X
+       2. Click Y
+       3. See Z
+   validations:
+     required: false
+ - type: input
+   attributes:
+    label: MHSF Username (if applicable)
+    description: If this bug has soft-locked your account or something similar where we need to know your username, please put it here.
+ - type: input
+   attributes:
+      label: Minecraft Username (if applicable)
+      description: If this bug is related to Minecraft account linking, please put your username here.

package.json

@@ -66,7 +66,7 @@
 		"remark-gfm": "^4.0.0",
 		"sonner": "^1.7.0",
 		"stripe-gradient": "^1.0.1",
-		"tailwind-merge": "^2.3.0",
+		"tailwind-merge": "^3.0.1",
 		"tailwindcss-animate": "^1.0.7",
 		"tailwindcss-patch": "^4.0.0",
 		"turbo": "^2.4.0",

yarn.lock

@@ -102,7 +102,7 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz"
   integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
 
-"@babel/runtime@^7.13.10", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.13.10", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
   version "7.24.8"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.8.tgz#5d958c3827b13cc6d05e038c07fb2e5e3420d82e"
   integrity sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==
@@ -7827,12 +7827,10 @@ synckit@^0.9.1:
     "@pkgr/core" "^0.1.0"
     tslib "^2.6.2"
 
-tailwind-merge@^2.3.0:
+tailwind-merge@^3.0.1:
-  version "2.3.0"
+  version "3.0.1"
-  resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.0.1.tgz#0f0189966511ebcd63ef98d9eaf5607beb0d59d3"
-  integrity sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==
+  integrity sha512-AvzE8FmSoXC7nC+oU5GlQJbip2UO7tmOhOfQyOmPhrStOGXHU08j8mZEHZ4BmCqY5dWTCo4ClWkNyRNx1wpT0g==
-  dependencies:
-    "@babel/runtime" "^7.24.1"
 
 tailwindcss-animate@^1.0.7:
   version "1.0.7"