From 888b488fead3c81060cbcdd84edd7aba9f770c35 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 13 Jun 2015 18:06:23 -0400 Subject: [PATCH] Small changes --- build.properties | 9 +++++++++ .../alchemicalWizardry/common/book/BloodMagicGuide.java | 2 +- .../assets/alchemicalwizardryBooks/lang/en_US.lang | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/build.properties b/build.properties index a0bb5147..43181560 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,8 @@ +<<<<<<< HEAD +# +#Thu Jun 04 17:28:17 EDT 2015 +======= +>>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2 mod_name=BloodMagic forge_version=10.13.4.1448-1.7.10 ccc_version=1.0.4.29 @@ -9,3 +14,7 @@ mod_version=1.3.3 minetweaker_version=Dev-1.7.10-3.0.9B build_number=5 mc_version=1.7.10 +<<<<<<< HEAD +build_number=5 +======= +>>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2 diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/book/BloodMagicGuide.java b/src/main/java/WayofTime/alchemicalWizardry/common/book/BloodMagicGuide.java index c48a9b1d..32986d06 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/book/BloodMagicGuide.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/book/BloodMagicGuide.java @@ -40,7 +40,7 @@ public class BloodMagicGuide registerAlchemyBook(); 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 = bmBookBuilder.build(); diff --git a/src/main/resources/assets/alchemicalwizardryBooks/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardryBooks/lang/en_US.lang index 00bfc4e0..73b24898 100644 --- a/src/main/resources/assets/alchemicalwizardryBooks/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardryBooks/lang/en_US.lang @@ -410,4 +410,5 @@ guide.BloodMagic.category.alchemy=The Alchemist guide.BloodMagic.welcomeMessage= guide.BloodMagic.book.title=Sanguine Scientiem guide.BloodMagic.book.name=Sanguine Scientiem +guide.BloodMagic.authorName=