Merge branch '1.12.2' of https://github.com/Electroblob77/Wizardry into 1.12.2

# Conflicts:
#	src/main/resources/assets/ebwizardry/lang/ru_ru.lang

src/main/resources/assets/ebwizardry/lang/zh_cn.lang

@@ -50,7 +50,7 @@ tile.ebwizardry\:acacia_lectern.name=金合欢木览术台
 tile.ebwizardry\:dark_oak_lectern.name=深色橡木览术台
 
 tile.ebwizardry\:receptacle.name=容杯
-tile.ebwizardry\:imbuement_altar.name=注法祭坛
+tile.ebwizardry\:imbuement_altar.name=注灵祭坛
 
 item.ebwizardry\:crystal_magic.name=魔力水晶
 item.ebwizardry\:crystal_magic.desc=水晶闪耀斑斓的色彩似乎在缓慢地变幻流转，暗示着其内蕴含的魔法能量。或许能以某种方法来驾驭这种魔力......
@@ -702,11 +702,11 @@ advancement.ebwizardry\:defeat_remnant.desc=猎杀守护方尖碑的遗灵并收
 advancement.ebwizardry\:find_library_ruins=我想我的书过期了
 advancement.ebwizardry\:find_library_ruins.desc=发现被遗忘的图书馆的遗迹
 advancement.ebwizardry\:restore_imbuement_altar=焕然如新
-advancement.ebwizardry\:restore_imbuement_altar.desc=为一座注法祭坛重现其旧日荣光
+advancement.ebwizardry\:restore_imbuement_altar.desc=为一座注灵祭坛重现其旧日荣光
 advancement.ebwizardry\:create_elemental_armour=移装易服
 advancement.ebwizardry\:create_elemental_armour.desc=为一件巫师盔甲注入任一奥术元素的灵尘
 advancement.ebwizardry\:restore_ruined_book=奥术考古学家
-advancement.ebwizardry\:restore_ruined_book.desc=在注法祭坛上修复一本破损的法术书
+advancement.ebwizardry\:restore_ruined_book.desc=在注灵祭坛上修复一本破损的法术书
 advancement.ebwizardry\:craft_lectern=奥术百科全书
 advancement.ebwizardry\:craft_lectern.desc=合成一个览术台以随时掌握你的法术图书馆的信息
 
@@ -727,7 +727,7 @@ gui.ebwizardry\:spell_book.mana_cost=魔力消耗: %s
 gui.ebwizardry\:spell_book.mana_cost_continuous=魔力消耗: %s/s
 gui.ebwizardry\:spell_book.mana_cost_undiscovered=魔力消耗: ？
 
-gui.ebwizardry\:lectern.title=Spell Lookup
+gui.ebwizardry\:lectern.title=法术查阅
 
 container.ebwizardry\:arcane_workbench=奥术工作台
 container.ebwizardry\:arcane_workbench.mana=魔力：%s/%s
@@ -1624,7 +1624,7 @@ config.ebwizardry.auto_place_underground_library_markers=自动标记地下图
 config.ebwizardry.auto_place_underground_library_markers.tooltip=控制古式地图是否自动标记地下的图书馆废墟。
 
 integration.jei.category.ebwizardry\:arcane_workbench=奥术工作台
-integration.jei.category.ebwizardry\:imbuement_altar=注法祭坛
+integration.jei.category.ebwizardry\:imbuement_altar=注灵祭坛
 
 integration.antiqueatlas.marker.ebwizardry.wizard_tower=巫师塔
 integration.antiqueatlas.marker.ebwizardry.obelisk=方尖碑