More texture tweaks. Renamed Aloe to Bromeliad.

common/biomesoplenty/api/BlockReferences.java

@@ -178,13 +178,14 @@ public class BlockReferences {
 		anenome (Blocks.flowers, 9),
 		lilyflower (Blocks.flowers, 10),
 		rainbowflower (Blocks.flowers, 11),
-		aloe (Blocks.flowers, 12),
+		bromeliad (Blocks.flowers, 12),
 		sunflower (Blocks.flowers, 13),
 		dandelion (Blocks.flowers, 15),
 		
 		hibiscus (Blocks.flowers2, 0),
 		lilyofthevalley (Blocks.flowers2, 1),
 		burningblossom (Blocks.flowers2, 2),
+		lavender (Blocks.flowers2, 2),
 		;
 
 		public Optional<? extends Block> block;

common/biomesoplenty/blocks/BlockBOPFlower.java

@@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPFlower extends BlockFlower
 {
-	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
+	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
 	private Icon[] textures;
 
 	private static final int SUNFLOWERTOP = 14;

common/biomesoplenty/blocks/BlockBOPFlower2.java

@@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockBOPFlower2 extends BlockFlower
 {
-	private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"};
+	private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"};
 	private Icon[] textures;
 
 	protected BlockBOPFlower2(int blockID, Material material)

common/biomesoplenty/configuration/BOPBiomes.java

@@ -206,7 +206,7 @@ public class BOPBiomes {
 		Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfigurationIDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.05F));
 		Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F));
 		Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfigurationIDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.5F, 1.3F));
-		Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.05F).setMinMaxHeight(0.2F, 0.4F));
+		Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.4F).setMinMaxHeight(0.2F, 0.4F));
 		Biomes.field = Optional.of((new BiomeGenField(BOPConfigurationIDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F));
 		Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfigurationIDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F));
 		Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.4F));

common/biomesoplenty/integration/ThaumcraftIntegration.java

@@ -217,7 +217,7 @@ public class ThaumcraftIntegration {
 		ThaumcraftApi.registerObjectTag(getBID("cosmos"), getBMeta("cosmos"), (new AspectList()).add(Aspect.PLANT, 4));
 		ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new AspectList()).add(Aspect.PLANT, 4));
 		ThaumcraftApi.registerObjectTag(getBID("daffodil"), getBMeta("daffodil"), (new AspectList()).add(Aspect.PLANT, 4));
-		ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.PLANT, 4));
+		ThaumcraftApi.registerObjectTag(getBID("bromeliad"), getBMeta("bromeliad"), (new AspectList()).add(Aspect.PLANT, 4));
 		ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1));
 		ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1));
 		ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1));

common/biomesoplenty/itemblocks/ItemBlockFlower.java

@@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlockFlower extends ItemBlock
 {
-	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
+	private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
 	@SideOnly(Side.CLIENT)
 	private Icon[] textures;
 	private static final int SUNFLOWERTOP = 14;

common/biomesoplenty/itemblocks/ItemBlockFlower2.java

@@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlockFlower2 extends ItemBlock
 {
-	private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom"};
+	private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender"};
 	@SideOnly(Side.CLIENT)
 	private Icon[] textures;
 

resources/assets/biomesoplenty/lang/de_DE.xml

@@ -49,7 +49,7 @@
     <entry key="tile.bop.flowers.anemone.name">Weißes Windröschen</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Wasserlilie</entry>
     <entry key="tile.bop.flowers.rainbowflower.name">Chromablume</entry>
-    <entry key="tile.bop.flowers.aloe.name">Aloe</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Aloe</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Sonnenblume</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Sonnenblume</entry>
     <entry key="tile.bop.flowers.dandelion.name">Weißer Löwenzahn</entry>

resources/assets/biomesoplenty/lang/en_US.xml

@@ -49,7 +49,7 @@
     <entry key="tile.bop.flowers.anemone.name">White Anemone</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Waterlily</entry>
     <entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
-    <entry key="tile.bop.flowers.aloe.name">Aloe</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Bromeliad</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Sunflower</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Sunflower</entry>
     <entry key="tile.bop.flowers.dandelion.name">White Dandelion</entry>
@@ -57,6 +57,7 @@
     <entry key="tile.bop.flowers2.hibiscus.name">Pink Hibiscus</entry>
     <entry key="tile.bop.flowers2.lilyofthevalley.name">Lily of the Valley</entry>
     <entry key="tile.bop.flowers2.burningblossom.name">Burning Blossom</entry>
+    <entry key="tile.bop.flowers2.lavender.name">Lavender</entry>
 
     <entry key="tile.bop.foliage.algae.name">Algae</entry>
     <entry key="tile.bop.foliage.shortgrass.name">Short Grass</entry>

resources/assets/biomesoplenty/lang/fr_CA.xml

@@ -45,7 +45,7 @@
     <entry key="tile.bop.flowers.violet.name">Violette</entry>
     <entry key="tile.bop.flowers.anemone.name">Anémone</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry>
-    <entry key="tile.bop.flowers.aloe.name">Aloé</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Aloé</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry>
     <entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry>

resources/assets/biomesoplenty/lang/fr_FR.xml

@@ -45,7 +45,7 @@
     <entry key="tile.bop.flowers.violet.name">Violette</entry>
     <entry key="tile.bop.flowers.anemone.name">Anémone</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry>
-    <entry key="tile.bop.flowers.aloe.name">Aloé</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Aloé</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry>
     <entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry>

resources/assets/biomesoplenty/lang/it_IT.xml

@@ -49,7 +49,7 @@
     <entry key="tile.bop.flowers.anemone.name">Anemone Bianca</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Ninfea</entry>
     <entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
-    <entry key="tile.bop.flowers.aloe.name">Aloe</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Aloe</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Girasole</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Girasole</entry>
     <entry key="tile.bop.flowers.dandelion.name">Dente di Leone Bianco</entry>
@@ -338,7 +338,7 @@
     <entry key="item.bop.ancientStaff.ancientstaff.name">Verga Venerabile</entry>
     <entry key="item.bop.ancientStaff.staffhandle.name">Manico della Verga Venerabile</entry>
     <entry key="item.bop.ancientStaff.staffpole.name">Corpo della Verga Venerabile</entry>
-    <entry key="item.bop.ancientStaff.stafftopper.name">Sommità della Verga Venerabile</entry>
+    <entry key="item.bop.ancientStaff.stafftopper.name">Sommit<EFBFBD> della Verga Venerabile</entry>
     <entry key="item.bop.ancientStaff.ancientstaffbroken.name">Verga Venerabile Esaurita</entry>
 
     <entry key="item.bop.soulManipulator.soulmanipulator_empty.name">Manipolatore d'Anima</entry>
@@ -370,8 +370,8 @@
     <entry key="fluid.bop.springWater">Acqua Primaverile</entry>
 
     <!--Phrases -->
-    <entry key="phrase.bop.promisedPortalOverworld">Un portale per la Terra Promessa è apparto nel cielo, sopra di te.</entry>
-    <entry key="phrase.bop.promisedPortalOther">Un portale per l'Overworld è apparto nel cielo, sopra di te.</entry>
+    <entry key="phrase.bop.promisedPortalOverworld">Un portale per la Terra Promessa <EFBFBD> apparto nel cielo, sopra di te.</entry>
+    <entry key="phrase.bop.promisedPortalOther">Un portale per l'Overworld <EFBFBD> apparto nel cielo, sopra di te.</entry>
 
     <!--Creative Tab -->
     <entry key="itemGroup.tabBiomesOPlenty">Biomes O' Plenty</entry>

resources/assets/biomesoplenty/lang/nl_NL.xml

@@ -45,7 +45,7 @@
     <entry key="tile.bop.flowers.violet.name">Violet</entry>
     <entry key="tile.bop.flowers.anemone.name">Anemoon</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Waterlely</entry>
-    <entry key="tile.bop.flowers.aloe.name">Aloë</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Aloë</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Zonnebloem</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Zonnebloem</entry>
     <entry key="tile.bop.flowers.dandelion.name">Paardebloem</entry>

resources/assets/biomesoplenty/lang/pl_PL.xml

@@ -50,7 +50,7 @@
     <entry key="tile.bop.flowers.anemone.name">Zawilec</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Lilia wodna</entry>
     <entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
-    <entry key="tile.bop.flowers.aloe.name">Aloes</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Aloes</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Słonecznik</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Słonecznik</entry>
     <entry key="tile.bop.flowers.dandelion.name">Dmuchawiec</entry>

resources/assets/biomesoplenty/lang/ru_RU.xml

@@ -49,7 +49,7 @@
     <entry key="tile.bop.flowers.anemone.name">Белый анемон</entry>
     <entry key="tile.bop.flowers.lilyflower.name">Кувшинка</entry>
     <entry key="tile.bop.flowers.rainbowflower.name">Радужный цветок</entry>
-    <entry key="tile.bop.flowers.aloe.name">Алоэ</entry>
+    <entry key="tile.bop.flowers.bromeliad.name">Алоэ</entry>
     <entry key="tile.bop.flowers.sunflowerbottom.name">Подсолнечник</entry>
     <entry key="tile.bop.flowers.sunflowertop.name">Подсолнечник</entry>
     <entry key="tile.bop.flowers.dandelion.name">Белый одуванчик</entry>