Rebasing, and make eslint happy with it

BondageClub/Screens/Character/Preference/Arousal.js

@@ -283,4 +283,4 @@ function PreferenceSubscreenArousalUnload() {
 	Player.FocusGroup = null;
 	CharacterAppearanceForceUpCharacter = -1;
 	CharacterLoadCanvas(Player);
-}
+}

BondageClub/Screens/Character/Preference/Audio.js

@@ -89,4 +89,4 @@ function PreferenceSubscreenAudioUnload() {
 			if (typeof audio === 'number' && audio > 0) Player.NotificationSettings[setting].Audio = NotificationAudioType.NONE;
 		}
 	}
-}
+}

BondageClub/Screens/Character/Preference/CensoredWords.js

@@ -94,4 +94,4 @@ function PreferenceSubscreenCensoredWordsExit() {
 function PreferenceSubscreenCensoredWordsUnload() {
 	ElementRemove("InputWord");
 	Player.ChatSettings.CensoredWordsList = PreferenceCensoredWordsList.join("|");
-}
+}

BondageClub/Screens/Character/Preference/Controller.js

@@ -87,4 +87,4 @@ function PreferenceSubscreenControllerExit() {
 
 function PreferenceSubscreenControllerUnload() {
 	ControllerStopCalibration(true);
-}
+}

BondageClub/Screens/Character/Preference/Notifications.js

@@ -201,4 +201,4 @@ function PreferenceSubscreenNotificationsUnload() {
 	if (enableAudio) Player.AudioSettings.Notifications = true;
 
 	NotificationReset(NotificationEventType.TEST);
-}
+}

BondageClub/Screens/Character/Preference/Preference.js

@@ -261,7 +261,7 @@ function PreferenceExit() {
 
 /**
  * Clear all GUI data and DOM elements creates by the preference screen load function
- * We don't do this in exit function for disconnects do not trigger the exit function 
+ * We don't do this in exit function for disconnects do not trigger the exit function
  */
 function PreferenceUnload() {
 	if (PreferenceSubscreen.name !== "Main") {
@@ -274,9 +274,9 @@ function PreferenceUnload() {
  */
 function PreferenceSubscreenExit() {
 	const validExit = PreferenceSubscreen.exit?.();
-	
+
 	// Only when the results is false (not undefined)
-	// The exit is just a exit of the subscreen's substate, return to block more exit. 
+	// The exit is just a exit of the subscreen's substate, return to block more exit.
 	if(validExit === false) return;
 
 	// The exit is a full exit of the subscreen, unload resources