From ce9a07d6926a8fd0fd8ef21d7f7956ab61b7f65b Mon Sep 17 00:00:00 2001 From: wiiv Date: Sat, 11 Apr 2015 02:27:28 +0100 Subject: [PATCH 1/2] I said I was going to do this today. --- .../botania/textures/items/flightTiara10.png | Bin 0 -> 19535 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/flightTiara10.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara10.png b/src/main/resources/assets/botania/textures/items/flightTiara10.png new file mode 100644 index 0000000000000000000000000000000000000000..b16fecb9e538492f231c12dc425b4ea948c0ff10 GIT binary patch literal 19535 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 Date: Sat, 11 Apr 2015 01:51:19 -0700 Subject: [PATCH 2/2] Run-on sentence! --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 742bd7498..5adef9ef8 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2181,7 +2181,7 @@ botania.page.overgrowthSeed0=An &1Overgrowth Seed&0 is an elusive item, which ca # -- LIVINGWOOD BOW botania.entry.livingwoodBow=Livingwood Bow -botania.page.livingwoodBow0=The &1Livingwood Bow&0 is, as the name describes, a bow made of &1Livingwood&0 strung with &1Mana Infused String&0. Due to its componenets, it will last for longer than a normal &1Bow&0, it'll also repair itself using &4Mana&0, similarly to &1Manasteel Tools&0. +botania.page.livingwoodBow0=The &1Livingwood Bow&0 is, as the name describes, a bow made of &1Livingwood&0 strung with &1Mana Infused String&0. Due to its componenets, it will last for longer than a normal &1Bow&0. It'll also repair itself using &4Mana&0, similarly to &1Manasteel Tools&0. botania.page.livingwoodBow1=Does it shoot airplanes? # -- CRYSTAL BOW