lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small changes

Browse source
This commit is contained in:
WayofTime 2015-06-13 18:06:23 -04:00
parent ff8cf59bb8
commit 888b488fea
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build.properties
View file

@ -1,3 +1,8 @@
<<<<<<< HEAD
#
#Thu Jun 04 17:28:17 EDT 2015
=======
>>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2
mod_name=BloodMagic mod_name=BloodMagic
forge_version=10.13.4.1448-1.7.10 forge_version=10.13.4.1448-1.7.10
ccc_version=1.0.4.29 ccc_version=1.0.4.29
@ -9,3 +14,7 @@ mod_version=1.3.3
minetweaker_version=Dev-1.7.10-3.0.9B minetweaker_version=Dev-1.7.10-3.0.9B
build_number=5 build_number=5
mc_version=1.7.10 mc_version=1.7.10
<<<<<<< HEAD
build_number=5
=======
>>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2

2
src/main/java/WayofTime/alchemicalWizardry/common/book/BloodMagicGuide.java
View file

@ -40,7 +40,7 @@ public class BloodMagicGuide
registerAlchemyBook(); registerAlchemyBook();
BookBuilder bmBookBuilder = new BookBuilder(); BookBuilder bmBookBuilder = new BookBuilder();
bmBookBuilder.setCategories(categories).setUnlocBookTitle("guide.BloodMagic.book.title").setUnlocWelcomeMessage("guide.BloodMagic.welcomeMessage").setUnlocDisplayName("guide.BloodMagic.book.name").setBookColor(new Color(190, 10, 0)); bmBookBuilder.setCategories(categories).setUnlocBookTitle("guide.BloodMagic.book.title").setUnlocWelcomeMessage("guide.BloodMagic.welcomeMessage").setUnlocDisplayName("guide.BloodMagic.book.name").setBookColor(new Color(190, 10, 0)).setAuthor("--Blood Magic");
// bloodMagicGuide = new Book(categories, "guide.BloodMagic.book.title", "guide.BloodMagic.welcomeMessage", "guide.BloodMagic.book.name", new Color(190, 10, 0)); // bloodMagicGuide = new Book(categories, "guide.BloodMagic.book.title", "guide.BloodMagic.welcomeMessage", "guide.BloodMagic.book.name", new Color(190, 10, 0));
bloodMagicGuide = bmBookBuilder.build(); bloodMagicGuide = bmBookBuilder.build();

1
src/main/resources/assets/alchemicalwizardryBooks/lang/en_US.lang
View file

@ -410,4 +410,5 @@ guide.BloodMagic.category.alchemy=The Alchemist
guide.BloodMagic.welcomeMessage= guide.BloodMagic.welcomeMessage=
guide.BloodMagic.book.title=Sanguine Scientiem guide.BloodMagic.book.title=Sanguine Scientiem
guide.BloodMagic.book.name=Sanguine Scientiem guide.BloodMagic.book.name=Sanguine Scientiem
guide.BloodMagic.authorName=