Merge branch 'master' into master

Author: Dream-Master

dependencies.gradle

@@ -2,14 +2,15 @@
 
 dependencies {
     api('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev')
-    api('com.github.GTNewHorizons:GTNHLib:0.6.24:dev')
+    api('com.github.GTNewHorizons:GTNHLib:0.6.30:dev')
 
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.43:api') {transitive=false}
     compileOnly('com.github.GTNewHorizons:ModularUI2:2.2.15-1.7.10:dev')
 //    runtimeOnlyNonPublishable('com.github.GTNewHorizons:ModularUI2:2.2.15-1.7.10:dev')
 
     compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.6:dev') {transitive=false}
     devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.52-GTNH:dev')
+
     compileOnly('com.github.GTNewHorizons:Railcraft:9.16.30:api') {transitive=false}
     compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.2-GTNH:api') {transitive=false}
     compileOnly('curse.maven:cofh-lib-220333:2388748')

src/main/resources/assets/botania/lang/en_US.lang

@@ -207,7 +207,7 @@ botania.nei.quickInfo:item.bone~0=You're gonna have a bad time
 botania.nei.quickInfo:item.lexicon~0=What exactly did you expect?
 botania.nei.quickInfo:item.terrasteel~4=You can get Terrasteel by tossing the right materials on a Terrestrial Agglomeration Plate
 botania.nei.quickInfo:item.enderAirBottle~15=You can get this by right clicking with a Glass Bottle while in the End
-primus
+
 # BUILDCRAFT INTEGRATION
 botania.triggers.manaDetector=Mana Burst
 botania.triggers.manaEmpty=Mana Empty

src/main/resources/assets/botania/lang/ru_RU.lang

@@ -752,7 +752,7 @@ tile.botania:blockManaQuartz.name=Блок манакварца
 tile.botania:chiseledManaQuartz.name=Резной блок манакварца
 tile.botania:pillarManaQuartz.name=Колонна из манакварца
 tile.botania:quartzSlabManaHalf.name=Плита из манакварца
-tile.botania:quartzSlabManaFull.nameПлита из манакварца
+tile.botania:quartzSlabManaFull.name=Плита из манакварца
 tile.botania:quartzStairsMana.name=Ступеньки из манакварца
 tile.botania:blockBlazeQuartz.name=Блок пламенного кварца
 tile.botania:chiseledBlazeQuartz.name=Резной блок пламенного кварца

src/main/resources/assets/botania/lang/zh_CN.lang

@@ -183,7 +183,7 @@ botania.nei.quickInfo:item.bone~0=你要倒霉了
 botania.nei.quickInfo:item.lexicon~0=你期待着什么?
 botania.nei.quickInfo:item.terrasteel~4=将正确的材料放在泰拉凝聚板上以制作泰拉钢
 botania.nei.quickInfo:item.enderAirBottle~15=要获取它,只需在在末地用玻璃瓶右击
-primus
+
 # BUILDCRAFT INTEGRATION
 botania.triggers.manaDetector=魔力脉冲
 botania.triggers.manaEmpty=魔力为0

src/main/resources/assets/botania/lang/zh_TW.lang

@@ -2672,7 +2672,7 @@ botania.page.manaAlchemy21=將&1硬化黏土&0變成&1紅沙&0
 botania.page.manaAlchemy22=粉碎&1黏土&0&1和磚塊&0
 botania.page.manaAlchemy23=製作&1劣質土&0
 botania.page.manaAlchemy24=&1草類&0的轉化
-botania.page.manaAlchemy25尋常花之間轉化
+botania.page.manaAlchemy25=尋常花之間轉化
 
 # -- BOTANICAL BREWERY
 botania.entry.brewery=植物釀造