From 54c8403b2a659998f4734b90f821f737fd890738 Mon Sep 17 00:00:00 2001 From: Trejkaz Date: Thu, 6 Aug 2015 20:33:27 +1000 Subject: [PATCH] =?UTF-8?q?Spelling,=20dying=20=E2=86=92=20dyeing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/{LensDyingRecipe.java => LensDyeingRecipe.java} | 2 +- src/main/java/vazkii/botania/common/item/lens/ItemLens.java | 6 +++--- src/main/resources/assets/botania/lang/de_DE.lang | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 2 +- src/main/resources/assets/botania/lang/es_AR.lang | 2 +- src/main/resources/assets/botania/lang/fr_FR.lang | 2 +- src/main/resources/assets/botania/lang/ko_KR.lang | 2 +- web-legacy/index.php | 2 +- web/module/index.php | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/vazkii/botania/common/crafting/recipe/{LensDyingRecipe.java => LensDyeingRecipe.java} (97%) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java similarity index 97% rename from src/main/java/vazkii/botania/common/crafting/recipe/LensDyingRecipe.java rename to src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index 44c6aa5be..443ff17d4 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -22,7 +22,7 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.lib.LibOreDict; -public class LensDyingRecipe implements IRecipe { +public class LensDyeingRecipe implements IRecipe { private static final List DYES = Arrays.asList(new String[] { "dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 43ef0db4a..a5d27eba9 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -34,7 +34,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; -import vazkii.botania.common.crafting.recipe.LensDyingRecipe; +import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -133,9 +133,9 @@ public class ItemLens extends ItemMod implements ILens, ITinyPlanetExcempt { setHasSubtypes(true); GameRegistry.addRecipe(new CompositeLensRecipe()); - GameRegistry.addRecipe(new LensDyingRecipe()); + GameRegistry.addRecipe(new LensDyeingRecipe()); RecipeSorter.register("botania:compositeLens", CompositeLensRecipe.class, Category.SHAPELESS, ""); - RecipeSorter.register("botania:lensDying", LensDyingRecipe.class, Category.SHAPELESS, ""); + RecipeSorter.register("botania:lensDying", LensDyeingRecipe.class, Category.SHAPELESS, ""); } @Override diff --git a/src/main/resources/assets/botania/lang/de_DE.lang b/src/main/resources/assets/botania/lang/de_DE.lang index 000cc1679..deec3722c 100644 --- a/src/main/resources/assets/botania/lang/de_DE.lang +++ b/src/main/resources/assets/botania/lang/de_DE.lang @@ -495,7 +495,7 @@ botania.page.spreader4=The spreader only fires one burst at once, it'll only fir botania.page.spreader5=Crafting the &1Mana Spreader&0 botania.page.spreader6=In order to upgrade the potential of the spreader, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
Lenses can be &4dyed&0 all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. botania.page.spreader7=The basic lens, it doesn't do anything... -botania.page.spreader8=&4Dying&0 lenses! +botania.page.spreader8=&4Dyeing&0 lenses! botania.page.spreader9=&1Rainbow Lens&0 all the way # -- MANA POOL diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 49ceb79e4..2efec797b 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1712,7 +1712,7 @@ botania.page.rfGenerator1=The bullet guys. I bit it. botania.entry.lens=Mana Lenses botania.page.lens0=In order to upgrade the potential a &1Mana Spreader&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
Lenses can be &4dyed&0, in a workbench, all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. botania.page.lens1=The basic lens, it doesn't do anything. -botania.page.lens2=&4Dying&0 lenses! +botania.page.lens2=&4Dyeing&0 lenses! botania.page.lens3=&1Rainbow Lens&0 all the way botania.page.lens4=But lenses are not only for fancy colors. One can upgrade them with all sorts of materials to create new lens which can do all sorts of effects on the &4Mana Bursts&0.
It's to take in mind that, if using a normal &1Mana Spreader&0, there needs to be a &4Mana&0 receiving block at the end for the burst to fire. A &1Redstone Mana Spreader&0 is recommended for some lenses. botania.page.lens5=Sometimes, though, having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, nor will two lenses of the same type. diff --git a/src/main/resources/assets/botania/lang/es_AR.lang b/src/main/resources/assets/botania/lang/es_AR.lang index 7701b8649..4e97d32bb 100644 --- a/src/main/resources/assets/botania/lang/es_AR.lang +++ b/src/main/resources/assets/botania/lang/es_AR.lang @@ -872,7 +872,7 @@ botania.page.rfGenerator1=The bullet guys. I bit it. botania.entry.lens=Mana Lenses botania.page.lens0=In order to upgrade the potential a &1Mana Spreader&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
Lenses can be &4dyed&0 all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. botania.page.lens1=The basic lens, it doesn't do anything. -botania.page.lens2=&4Dying&0 lenses! +botania.page.lens2=&4Dyeing&0 lenses! botania.page.lens3=&1Rainbow Lens&0 all the way botania.page.lens4=But lenses are not only for fancy colors. One can upgrade them with all sorts of materials to create new lens which can do all sorts of effects on the &4Mana Bursts&0.
It's to take in mind that, if using a normal &1Mana Spreader&0, there needs to be a block that can receive &4Mana&0 at the end for the burst to fire. A &1Redstone Mana Spreader&0 is recommended for some of the lenses. botania.page.lens5=Sometimes, though, having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, nor will two lenses of the same type. diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index ea2075051..a2ce3f399 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -1712,7 +1712,7 @@ botania.page.rfGenerator1=The bullet guys. I bit it. botania.entry.lens=Mana Lenses botania.page.lens0=In order to upgrade the potential a &1Diffuseur de mana&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
Lenses can be &4dyed&0, in a workbench, all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. botania.page.lens1=The basic lens, it doesn't do anything. -botania.page.lens2=&4Dying&0 lenses! +botania.page.lens2=&4Dyeing&0 lenses! botania.page.lens3=&1Rainbow Lens&0 all the way botania.page.lens4=But lenses are not only for fancy colors. One can upgrade them with all sorts of materials to create new lens which can do all sorts of effects on the &4Mana Bursts&0.
It's to take in mind that, if using a normal &1Diffuseur de mana&0, there needs to be a &4Mana&0 receiving block at the end for the burst to fire. A &1Redstone Diffuseur de mana&0 is recommended for some lenses. botania.page.lens5=Sometimes, though, having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, nor will two lenses of the same type. diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 112caab92..9ca6bcc73 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -1666,7 +1666,7 @@ botania.page.rfGenerator1=The bullet guys. I bit it. botania.entry.lens=Mana Lenses botania.page.lens0=In order to upgrade the potential a &1Mana Spreader&0, one can apply &1Mana Lenses&0. The very basic mana lens does absolutely nothing.
Lenses can be &4dyed&0, in a workbench, all the 16 colors of the spectrum, or combined with a &1Mana Pearl&0 to create a &1Rainbow Lens&0. These will change the color of the burst. botania.page.lens1=The basic lens, it doesn't do anything. -botania.page.lens2=&4Dying&0 lenses! +botania.page.lens2=&4Dyeing&0 lenses! botania.page.lens3=&1Rainbow Lens&0 all the way botania.page.lens4=But lenses are not only for fancy colors. One can upgrade them with all sorts of materials to create new lens which can do all sorts of effects on the &4Mana Bursts&0.
It's to take in mind that, if using a normal &1Mana Spreader&0, there needs to be a &4Mana&0 receiving block at the end for the burst to fire. A &1Redstone Mana Spreader&0 is recommended for some lenses. botania.page.lens5=Sometimes, though, having a single &1Mana Lens&0 in a spreader just isn't enough sometimes. By combining two lenses with a &1Slimeball&0 in a crafting table, it's possible to unite them into one, and keep the effects of both.
The first lens used determines the visuals (texture and color). It's to note that some combinations will not work, nor will two lenses of the same type. diff --git a/web-legacy/index.php b/web-legacy/index.php index cec395dff..9c624a6c1 100644 --- a/web-legacy/index.php +++ b/web-legacy/index.php @@ -24,7 +24,7 @@

Beautifully Presented

-

Decorate your worlds with colors. Botania generates a total of sixteen new flowers, all of these are used both for decoration and crafting. As a bonus, they have shiny particles and can be used for dying.

+

Decorate your worlds with colors. Botania generates a total of sixteen new flowers, all of these are used both for decoration and crafting. As a bonus, they have shiny particles and can be used for dyeing.

Download Now

diff --git a/web/module/index.php b/web/module/index.php index d1f9bcfc0..1bd51164a 100644 --- a/web/module/index.php +++ b/web/module/index.php @@ -11,7 +11,7 @@

Beautifully Presented

-

Decorate your worlds with colors. Botania generates a total of sixteen new flowers, all of these are used both for decoration and crafting. As a bonus, they have shiny particles and can be used for dying.

+

Decorate your worlds with colors. Botania generates a total of sixteen new flowers, all of these are used both for decoration and crafting. As a bonus, they have shiny particles and can be used for dyeing.

Download Botania