diff options
| author | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2022-08-10 17:56:59 +0800 |
|---|---|---|
| committer | Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> | 2022-08-10 17:56:59 +0800 |
| commit | 96f76751b6dd5a19387921bd33fc728ca17919e6 (patch) | |
| tree | 858d88e532fe9af9ccfab120d38b60a9e528e927 /features | |
| parent | 46560b3ed8d053b58722737f30d9145c92df45ba (diff) | |
| download | SoopyV2-96f76751b6dd5a19387921bd33fc728ca17919e6.tar.gz SoopyV2-96f76751b6dd5a19387921bd33fc728ca17919e6.tar.bz2 SoopyV2-96f76751b6dd5a19387921bd33fc728ca17919e6.zip | |
merge conflict
Diffstat (limited to 'features')
| -rw-r--r-- | features/globalSettings/index.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/features/globalSettings/index.js b/features/globalSettings/index.js index 8877157..69da074 100644 --- a/features/globalSettings/index.js +++ b/features/globalSettings/index.js @@ -52,10 +52,8 @@ class GlobalSettings extends Feature { this.hideFallingBlocks = new ToggleSetting("Hide falling blocks", "NOTE: This setting is a bit laggy", false, "hide_falling_sand", this) this.twitchCommands = new ToggleSetting("Ingame twitch bot commands", "Allows u to use twitch bot commands ingame (eg -sa)", true, "twitch_commands_ingame", this) this.itemWorth = new ToggleSetting("(Approximate) Item worth in lore", "Accounts for stuff like enchants/recombs ect", false, "item_worth", this) -<<<<<<< HEAD this.showHecatomb = new ToggleSetting("Show hecatomb enchant info in lore", "", true, "show_hecatomb", this) this.showChampion = new ToggleSetting("Show champion enchant info in lore", "", true, "show_champion", this) -======= this.oldMasterStars = new ToggleSetting("Use Old Master Stars", "replaces the ugly new master star on item name with the old fashion one", false, "old_master_star", this) this.registerEvent('itemTooltip', (lore, i, e) => { @@ -84,7 +82,6 @@ class GlobalSettings extends Feature { return } }) ->>>>>>> d2cb0e2c1ce2d2bd5b02dc6f74c96a5b43891f86 this.firstPageSettings = [this.darkTheme] |