diff --git a/Common/src/main/resources/assets/hexal/lang/en_us.json b/Common/src/main/resources/assets/hexal/lang/en_us.json index 4741a9ba..7bb8fc62 100644 --- a/Common/src/main/resources/assets/hexal/lang/en_us.json +++ b/Common/src/main/resources/assets/hexal/lang/en_us.json @@ -24,11 +24,8 @@ "hexcasting.mishap.invalid_value.class.wisp": "a wisp", "hexcasting.mishap.invalid_value.class.consumable_entity": "a consumable entity", "hexcasting.mishap.invalid_value.class.wisp.casting": "a casting wisp", - "hexcasting.mishap.invalid_value.class.type.block": "a block type", - "hexcasting.mishap.invalid_value.class.type.item": "an item type", - "hexcasting.mishap.invalid_value.class.type.entity": "an entity or entity type", - "hexcasting.mishap.invalid_value.class.type.block.able": "an item type that has a block", - "hexcasting.mishap.invalid_value.class.type.list.double": "a list of numbers", + "hexcasting.mishap.invalid_value.class.list.double": "a list of numbers", + "hexcasting.mishap.invalid_value.class.list.vec": "a list of vectors", "hexcasting.mishap.invalid_value.class.gate": "a gate", "hexcasting.mishap.invalid_value.class.mote": "a mote", "hexcasting.mishap.invalid_value.class.moteentity.itemitemframe": "a mote, item entity, or item frame", @@ -45,12 +42,10 @@ "hexcasting.mishap.invalid_value.mote_not_size_one": "a mote with no NBT data or of size one", "hexcasting.mishap.invalid_value.gate.offset": "an offset of at most %f blocks", - - "hexcasting.iota.hexal:iota_type": "Iota Type", - "hexcasting.iota.hexal:entity_type": "Entity Type", - "hexcasting.iota.hexal:item_type": "Item Type", "hexcasting.iota.hexal:gate": "Gate", - "hexcasting.iota.hexal:item": "Item", + "hexcasting.iota.hexal:gate.desc": "a gate", + "hexcasting.iota.hexal:item": "Mote", + "hexcasting.iota.hexal:item.desc": "a mote", "hexal.spelldata.entity_type": "Type", "hexal.spelldata.gate": "Gate %d", diff --git a/Common/src/main/resources/assets/hexal/lang/zh_cn.json b/Common/src/main/resources/assets/hexal/lang/zh_cn.json index fa94fce3..5884cafc 100644 --- a/Common/src/main/resources/assets/hexal/lang/zh_cn.json +++ b/Common/src/main/resources/assets/hexal/lang/zh_cn.json @@ -24,11 +24,8 @@ "hexcasting.mishap.invalid_value.class.wisp": "一个咒灵", "hexcasting.mishap.invalid_value.class.consumable_entity": "一个可被拆解的实体", "hexcasting.mishap.invalid_value.class.wisp.casting": "一个施法咒灵", - "hexcasting.mishap.invalid_value.class.type.block": "一个方块类型", - "hexcasting.mishap.invalid_value.class.type.item": "一个物品类型", - "hexcasting.mishap.invalid_value.class.type.entity": "一个实体或实体类型", - "hexcasting.mishap.invalid_value.class.type.block.able": "一个可代表方块的物品类型", - "hexcasting.mishap.invalid_value.class.type.list.double": "一个由数组成的列表", + "hexcasting.mishap.invalid_value.class.list.double": "一个由数组成的列表", + "hexcasting.mishap.invalid_value.class.list.vec": "一个由向量组成的列表", "hexcasting.mishap.invalid_value.class.gate": "一个门径", "hexcasting.mishap.invalid_value.class.mote": "一个物元", "hexcasting.mishap.invalid_value.class.moteentity.itemitemframe": "一个物元、物品实体或物品展示框", @@ -45,12 +42,10 @@ "hexcasting.mishap.invalid_value.mote_not_size_one": "一个不包含NBT数据或大小为1的物元", "hexcasting.mishap.invalid_value.gate.offset": "不超过%f格的偏移量", - - "hexcasting.iota.hexal:iota_type": "Iota类型", - "hexcasting.iota.hexal:entity_type": "实体类型", - "hexcasting.iota.hexal:item_type": "物品类型", "hexcasting.iota.hexal:gate": "门径", - "hexcasting.iota.hexal:item": "物品", + "hexcasting.iota.hexal:gate.desc": "一个门径", + "hexcasting.iota.hexal:item": "物元", + "hexcasting.iota.hexal:item.desc": "一个物元", "hexal.spelldata.entity_type": "类型", "hexal.spelldata.gate": "门径 %d",