Merge branch 'master' of https://github.com/mwittrien/BetterDiscordAddons

Library/_res/BDFDB.data.json

@@ -4741,7 +4741,6 @@
 		}
 	},
 	"BDFDB_Patrons": {
-		"838434341197316126": 	{"active": true,		"t3": true,		"custom": true,		"text": "Allmächtig",		"id": "EXITIUM / K E R"},
 		"596006086511689748": 	{"active": true,		"t3": false,	"custom": false,	"text": "",					"id": "Marshtomp"},
 		"89482511343702016": 	{"active": true,		"t3": false,	"custom": false,	"text": "",					"id": "AzukiPuddles"},
 		"341383936984875020": 	{"active": true,		"t3": true,		"custom": false,	"text": "",					"id": "dannycoch (DaCo)"},

Plugins/EditServers/EditServers.plugin.js

@@ -2,7 +2,7 @@
  * @name EditServers
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 2.2.9
+ * @version 2.3.1
  * @description Allows you to locally edit Servers
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -17,12 +17,12 @@ module.exports = (_ => {
 		"info": {
 			"name": "EditServers",
 			"author": "DevilBro",
-			"version": "2.2.9",
+			"version": "2.3.1",
 			"description": "Allows you to locally edit Servers"
 		},
 		"changeLog": {
-			"improved": {
+			"fixed": {
-				"Icon Color": "Works again"
+				"Settings": "Shown again"
 			}
 		}
 	};
@@ -183,6 +183,8 @@ module.exports = (_ => {
 							}),
 							children: BDFDB.LanguageUtils.LanguageStrings.RESET
 						}));
+						
+						return settingsItems;
 					}
 				});
 			}

Plugins/PluginRepo/PluginRepo.plugin.js

@@ -2,7 +2,7 @@
  * @name PluginRepo
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 2.2.1
+ * @version 2.2.2
  * @description Allows you to download all Plugins from BD's Website within Discord
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -17,12 +17,15 @@ module.exports = (_ => {
 		"info": {
 			"name": "PluginRepo",
 			"author": "DevilBro",
-			"version": "2.2.1",
+			"version": "2.2.2",
 			"description": "Allows you to download all Plugins from BD's Website within Discord"
 		},
 		"changeLog": {
 			"improved": {
 				"Thumbnail Conversion": "Moved Thumbnail Conversion to Card Component to reduce stress on BD Website"
+			},
+			"fixed": {
+				"Settings": "No longer get reset"
 			}
 		}
 	};
@@ -206,7 +209,7 @@ module.exports = (_ => {
 								title: "Show following Plugins",
 								children: Object.keys(_this.defaults.filters).map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
 									type: "Switch",
-									plugin: this,
+									plugin: _this,
 									keys: ["filters", key],
 									label: _this.defaults.filters[key].description,
 									value: _this.settings.filters[key],
@@ -218,7 +221,7 @@ module.exports = (_ => {
 							}),
 							Object.keys(_this.defaults.general).map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
 								type: "Switch",
-								plugin: this,
+								plugin: _this,
 								keys: ["general", key],
 								label: _this.defaults.general[key].description,
 								note: key == "rnmStart" && !automaticLoading && "Automatic Loading has to be enabled",
@@ -1069,4 +1072,4 @@ module.exports = (_ => {
 			}
 		};
 	})(window.BDFDB_Global.PluginUtils.buildPlugin(config));
-})();
+})();

Plugins/ShowHiddenChannels/ShowHiddenChannels.plugin.js

@@ -2,7 +2,7 @@
  * @name ShowHiddenChannels
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 2.9.6
+ * @version 2.9.7
  * @description Displays all hidden Channels, which can't be accessed due to Role Restrictions, this won't allow you to read them (impossible)
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -17,12 +17,15 @@ module.exports = (_ => {
 		"info": {
 			"name": "ShowHiddenChannels",
 			"author": "DevilBro",
-			"version": "2.9.6",
+			"version": "2.9.7",
 			"description": "Displays all hidden Channels, which can't be accessed due to Role Restrictions, this won't allow you to read them (impossible)"
 		},
 		"changeLog": {
 			"improved": {
 				"Channel Topic": "Formatting Channel Topic in Access Modal (makes Links clickable, etc)"
+			},
+			"fixed": {
+				"Settings": "Show again"
 			}
 		}
 	};
@@ -316,11 +319,6 @@ module.exports = (_ => {
 					}
 				});
 			}
-			getSettingsPanel (collapseStates = {}) {
-				let settingsPanel, settingsItems = [];
-				
-				return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, settingsItems);
-			}
 
 			onSettingsClosed () {
 				if (this.SettingsUpdated) {
@@ -801,4 +799,4 @@ module.exports = (_ => {
 			}
 		};
 	})(window.BDFDB_Global.PluginUtils.buildPlugin(config));
-})();
+})();

Plugins/ThemeRepo/ThemeRepo.plugin.js

@@ -2,7 +2,7 @@
  * @name ThemeRepo
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 2.2.1
+ * @version 2.2.2
  * @description Allows you to download all Themes from BD's Website within Discord
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -17,12 +17,15 @@ module.exports = (_ => {
 		"info": {
 			"name": "ThemeRepo",
 			"author": "DevilBro",
-			"version": "2.2.1",
+			"version": "2.2.2",
 			"description": "Allows you to download all Themes from BD's Website within Discord"
 		},
 		"changeLog": {
 			"improved": {
 				"Thumbnail Conversion": "Moved Thumbnail Conversion to Card Component to reduce stress on BD Website"
+			},
+			"fixed": {
+				"Settings": "No longer get reset"
 			}
 		}
 	};
@@ -553,7 +556,7 @@ module.exports = (_ => {
 								title: "Show following Themes",
 								children: Object.keys(_this.defaults.filters).map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
 									type: "Switch",
-									plugin: this,
+									plugin: _this,
 									keys: ["filters", key],
 									label: _this.defaults.filters[key].description,
 									value: _this.settings.filters[key],
@@ -565,7 +568,7 @@ module.exports = (_ => {
 							}),
 							Object.keys(_this.defaults.general).map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
 								type: "Switch",
-								plugin: this,
+								plugin: _this,
 								keys: ["general", key],
 								label: _this.defaults.general[key].description,
 								note: key == "rnmStart" && !automaticLoading && "Automatic Loading has to be enabled",
@@ -1623,4 +1626,4 @@ module.exports = (_ => {
 			}
 		};
 	})(window.BDFDB_Global.PluginUtils.buildPlugin(config));
-})();
+})();

Themes/BlurpleRecolor/BlurpleRecolor.css

@@ -2130,17 +2130,17 @@
 
 .bd-switch input:checked + .bd-switch-body {
 	--switch-color: rgba(var(--accentcolor), 0.8);
-	background-color: rgba(var(--accentcolor), 0.8);
+	background-color: rgba(var(--accentcolor), 0.8) !important;
 }
 .bd-switch input:active + .bd-switch-body {
 	--switch-color: rgba(var(--accentcolor));
 }
 .bd-switch input:checked:hover + .bd-switch-body {
-	background: var(--accentcolor-hover);
+	background: var(--accentcolor-hover) !important;
 }
 .bd-switch input:checked:active + .bd-switch-body {
 	--switch-color: rgb(var(--accentcolor));
-	background: var(--accentcolor-active);
+	background: var(--accentcolor-active) !important;
 }
 
 html .monaco-editor .find-widget .monaco-inputbox.synthetic-focus {