Skip to content

Commit

Permalink
Merge branch 'master-1.8' into master-1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
rubensworks committed May 6, 2016
2 parents e772a24 + 3c25a31 commit 4cd10b8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/resources/assets/evilcraft/info/book.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<paragraph>infoBook.evilcraft.firstAge.vengeanceSpirits.catchingSpirits.text1</paragraph>
<paragraph>infoBook.evilcraft.firstAge.vengeanceSpirits.catchingSpirits.text2</paragraph>
<appendix type="image" width="110" height="60">evilcraft:textures/gui/infobook/catchSpirits.png</appendix>
<appendix type="craftingRecipe">evilcraft:boxOfEternalClosure</appendix>
<appendix type="craftingRecipe" predefined="true">evilcraft:boxOfEternalClosureFilled</appendix>
<appendix type="craftingRecipe">evilcraft:vengeanceFocus</appendix>
</section>
<section name="infoBook.evilcraft.firstAge.vengeanceSpirits.spiritProtection">
Expand Down Expand Up @@ -342,7 +342,7 @@
<section name="infoBook.evilcraft.secondAge.tools.vengeancePickaxe">
<tag>vengeancePickaxe</tag>
<paragraph>infoBook.evilcraft.secondAge.tools.vengeancePickaxe.text</paragraph>
<appendix type="craftingRecipe">evilcraft:vengeancePickaxe</appendix>
<appendix type="craftingRecipe" predefined="true">evilcraft:vengeancePickaxeFortune</appendix>
</section>
<section name="infoBook.evilcraft.secondAge.tools.gemstoneTorch">
<tag>gemStoneTorch</tag>
Expand All @@ -359,7 +359,7 @@
<section name="infoBook.evilcraft.secondAge.weapons.veinSword">
<tag>veinSword</tag>
<paragraph>infoBook.evilcraft.secondAge.weapons.veinSword.text</paragraph>
<appendix type="craftingRecipe">evilcraft:veinSword</appendix>
<appendix type="craftingRecipe" predefined="true">evilcraft:veinSwordLooting</appendix>
</section>
<section name="infoBook.evilcraft.secondAge.weapons.maceOfDistortion">
<tag>maceOfDistortion</tag>
Expand Down

0 comments on commit 4cd10b8

Please sign in to comment.