From ad7f50d36156d5eba42adbd232261d53c965ea99 Mon Sep 17 00:00:00 2001
From: Donovan Daniels <hewwo@yiff.rocks>
Date: Mon, 18 Jul 2022 08:33:00 -0500
Subject: [PATCH] rebase Removals: - abalabahaha/eris#1283 -
 abalabahaha/eris#1285 - abalabahaha/eris#1369

Additions:
- abalabahaha/eris#494
- abalabahaha/eris#1193
- abalabahaha/eris#1338
- abalabahaha/eris#1386
---
 config.json | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/config.json b/config.json
index 232fb95..6744863 100755
--- a/config.json
+++ b/config.json
@@ -7,6 +7,16 @@
 					"branch": "dev",
 					"remote": "upstream"
 				},
+				{
+					"name": "Follow http/https redirects when playing song (1193)",
+					"branch": "piper-follow-redirects",
+					"remote": "macdja38"
+				},
+				{
+					"name": "Return void on 204 (1193)",
+					"branch": "response-fix",
+					"remote": "bsian03"
+				},
 				{
 					"name": "Allow configuring RequestHandler to use HTTP instead of HTTPS (1193)",
 					"branch": "master",
@@ -19,23 +29,13 @@
 				},
 				{
 					"name": "Guild Scheduled Events (1275)",
-					"branch": "deprecation-process-warnings",
-					"remote": "eritbh"
-				},
-				{
-					"name": "Guild Scheduled Events (1276)",
 					"branch": "guild-events",
 					"remote": "loliticos"
 				},
 				{
-					"name": "feat(connect): Add token check (1283)",
-					"branch": "token-check",
-					"remote": "catboi8"
-				},
-				{
-					"name": "Rework file attachments (1285)",
-					"branch": "form-data",
-					"remote": "bsian03"
+					"name": "Use process warnings for deprecations (1276)",
+					"branch": "deprecation-process-warnings",
+					"remote": "eritbh"
 				},
 				{
 					"name": "refactor(interactions): Redo types and remove unnecessary data (1309)",
@@ -47,16 +47,16 @@
 					"branch": "modals",
 					"remote": "linker-123"
 				},
+				{
+					"name": "Remove all user account features (1338)",
+					"branch": "selfbot",
+					"remote": "bsian03"
+				},
 				{
 					"name": "Attachment type (1358)",
 					"branch": "attachments-type",
 					"remote": "coolcalcacol"
 				},
-				{
-					"name": "Adding support for type 24 message (1369)",
-					"branch": "dev",
-					"remote": "flamableassassin"
-				},
 				{
 					"name": "feat(permissions): Slash Permissions v2 (1372)",
 					"branch": "slash-permissions-v2",
@@ -72,6 +72,11 @@
 					"branch": "gateway-options",
 					"remote": "donovandmc"
 				},
+				{
+					"name": "Convert remaining #client to #_client (1386)",
+					"branch": "client-underscore",
+					"remote": "donovandmc"
+				},
 				{
 					"name": "feat(AutoModeration): Support Auto Moderation (1390)",
 					"branch": "automod",
@@ -105,7 +110,8 @@
 			"eritbh": "https://github.com/eritbh/eris",
 			"coolcalcacol": "https://github.com/coolcalcacol/eris",
 			"headtrixz": "https://github.com/HeadTriXz/eris-1",
-			"flamableassassin": "https://github.com/flamableassassin/eris"
+			"flamableassassin": "https://github.com/flamableassassin/eris",
+			"macdja38": "https://github.com/macdja38/eris"
 		}
 	},
 	"outdatedPRCheck": {