Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into tooltopfix

merge newest changes from upstream

2 files changed, 28 insertions, 2 deletions

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index c0ee7809..15ba6216 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -9,6 +9,10 @@
   "text.autoconfig.skyblocker.option.general.bars": "Health, Mana, Defence & XP Bars",
   "text.autoconfig.skyblocker.option.general.bars.enableBars": "Enable Bars",
   "text.autoconfig.skyblocker.option.general.bars.barpositions": "Configure Bar Positions",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "Layer 1",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "Layer 2",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Right",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "Disabled",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "Health Bar Position",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Mana Bar Position",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position",
@@ -21,6 +25,9 @@
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Enable Avg. BIN Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Average Type",
   "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "You can choose how many days of average price to be",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "1 day price",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "3 day price",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "Both",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Enable Lowest BIN Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Enable Bazaar buy/sell Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Enable Museum & Date",
@@ -32,6 +39,9 @@
 
   "text.autoconfig.skyblocker.category.richPresence": "Discord Rich Presence",
   "text.autoconfig.skyblocker.option.richPresence.info": "Skyblock Info",
+  "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "PURSE",
+  "text.autoconfig.skyblocker.option.richPresence.info.BITS": "BITS",
+  "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "LOCATION",
   "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "This value doesn't matter if you are cycling",
   "text.autoconfig.skyblocker.option.richPresence.cycleMode": "Cycle Skyblock Info",
   "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Enabled",
@@ -78,6 +88,9 @@
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y",
 
   "text.autoconfig.skyblocker.category.messages": "Messages",
+  "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "Disabled",
+  "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "Filter",
+  "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "Move to action bar",
   "text.autoconfig.skyblocker.option.messages.hideAbility": "Hide Ability Cooldown",
   "text.autoconfig.skyblocker.option.messages.hideHeal": "Hide Heal Messages",
   "text.autoconfig.skyblocker.option.messages.hideAOTE": "Hide AOTE Messages",
diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json
index 59ec1bf2..cdc11344 100644
--- a/src/main/resources/assets/skyblocker/lang/zh_cn.json
+++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json
@@ -9,6 +9,10 @@
   "text.autoconfig.skyblocker.option.general.bars": "生命，法力，防御以及经验条",
   "text.autoconfig.skyblocker.option.general.bars.enableBars": "启用属性条",
   "text.autoconfig.skyblocker.option.general.bars.barpositions": "配置属性条位置",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "下排",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "上排",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "右侧",
+  "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "禁用",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "生命条位置",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "法力条位置",
   "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "防御条位置",
@@ -21,6 +25,9 @@
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "显示平均BIN（立即购买）价格",
   "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "平均类型",
   "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "你可以选择查看多少天的平均价格",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "1天价格",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "3天价格",
+  "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "同时显示",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "显示最低BIN（立即购买）价格",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "显示集市购买/卖出价格",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "显示博物馆与日期信息",
@@ -32,9 +39,12 @@
 
   "text.autoconfig.skyblocker.category.richPresence": "Discord活动状态",
   "text.autoconfig.skyblocker.option.richPresence.info": "Skyblock信息",
+  "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "钱包",
+  "text.autoconfig.skyblocker.option.richPresence.info.BITS": "比特",
+  "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "位置",
   "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "如果您正在循环模式，这个值将不会生效",
   "text.autoconfig.skyblocker.option.richPresence.cycleMode": "循环Skyblock信息",
-  "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "已启用",
+  "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "启用",
   "text.autoconfig.skyblocker.option.richPresence.customMessage": "自定义消息",
 
   "text.autoconfig.skyblocker.category.quickNav" : "快速导航",
@@ -72,12 +82,15 @@
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "解决Fetchur的迷题",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "解决Puzzler的迷题",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "矮人HUD",
-  "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "已启用",
+  "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "启用",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "启用背景",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X",
   "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y",
 
   "text.autoconfig.skyblocker.category.messages": "消息",
+  "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "禁用",
+  "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "启用",
+  "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "移动到动作栏",
   "text.autoconfig.skyblocker.option.messages.hideAbility": "隐藏技能冷却",
   "text.autoconfig.skyblocker.option.messages.hideHeal": "隐藏治疗消息",
   "text.autoconfig.skyblocker.option.messages.hideAOTE": "隐藏AOTE消息",