diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java
index 32c73e59f..e41df5df0 100644
--- a/common/biomesoplenty/api/BlockReferences.java
+++ b/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 block;
diff --git a/common/biomesoplenty/blocks/BlockBOPFlower.java b/common/biomesoplenty/blocks/BlockBOPFlower.java
index 189c79999..a8cc729ea 100644
--- a/common/biomesoplenty/blocks/BlockBOPFlower.java
+++ b/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;
diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java
index b08cdfdb9..00e9701c8 100644
--- a/common/biomesoplenty/blocks/BlockBOPFlower2.java
+++ b/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)
diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java
index 7243567f1..f960e09e2 100644
--- a/common/biomesoplenty/configuration/BOPBiomes.java
+++ b/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));
diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java
index c26fd82cc..a27c35e5c 100644
--- a/common/biomesoplenty/integration/ThaumcraftIntegration.java
+++ b/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));
diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower.java b/common/biomesoplenty/itemblocks/ItemBlockFlower.java
index 8aafd9cf6..3810b866e 100644
--- a/common/biomesoplenty/itemblocks/ItemBlockFlower.java
+++ b/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;
diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java
index 0f28c8e45..426466fa6 100644
--- a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java
+++ b/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;
diff --git a/resources/assets/biomesoplenty/lang/de_DE.xml b/resources/assets/biomesoplenty/lang/de_DE.xml
index cf2f07242..b482a2b00 100644
--- a/resources/assets/biomesoplenty/lang/de_DE.xml
+++ b/resources/assets/biomesoplenty/lang/de_DE.xml
@@ -49,7 +49,7 @@
Weißes Windröschen
Wasserlilie
Chromablume
- Aloe
+ Aloe
Sonnenblume
Sonnenblume
Weißer Löwenzahn
diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml
index 21f8c3b09..4b3718936 100644
--- a/resources/assets/biomesoplenty/lang/en_US.xml
+++ b/resources/assets/biomesoplenty/lang/en_US.xml
@@ -49,7 +49,7 @@
White Anemone
Waterlily
Chromaflora
- Aloe
+ Bromeliad
Sunflower
Sunflower
White Dandelion
@@ -57,6 +57,7 @@
Pink Hibiscus
Lily of the Valley
Burning Blossom
+ Lavender
Algae
Short Grass
diff --git a/resources/assets/biomesoplenty/lang/fr_CA.xml b/resources/assets/biomesoplenty/lang/fr_CA.xml
index 8c362f121..39ba24ab0 100644
--- a/resources/assets/biomesoplenty/lang/fr_CA.xml
+++ b/resources/assets/biomesoplenty/lang/fr_CA.xml
@@ -45,7 +45,7 @@
Violette
Anémone
Fleur de Nénuphar
- Aloé
+ Aloé
Tornesol
Tornesol
Pissenlit
diff --git a/resources/assets/biomesoplenty/lang/fr_FR.xml b/resources/assets/biomesoplenty/lang/fr_FR.xml
index 0951f26de..755ae6724 100644
--- a/resources/assets/biomesoplenty/lang/fr_FR.xml
+++ b/resources/assets/biomesoplenty/lang/fr_FR.xml
@@ -45,7 +45,7 @@
Violette
Anémone
Fleur de Nénuphar
- Aloé
+ Aloé
Tornesol
Tornesol
Pissenlit
diff --git a/resources/assets/biomesoplenty/lang/it_IT.xml b/resources/assets/biomesoplenty/lang/it_IT.xml
index 60637a8be..e00e22e65 100644
--- a/resources/assets/biomesoplenty/lang/it_IT.xml
+++ b/resources/assets/biomesoplenty/lang/it_IT.xml
@@ -49,7 +49,7 @@
Anemone Bianca
Ninfea
Chromaflora
- Aloe
+ Aloe
Girasole
Girasole
Dente di Leone Bianco
@@ -338,7 +338,7 @@
Verga Venerabile
Manico della Verga Venerabile
Corpo della Verga Venerabile
- Sommit della Verga Venerabile
+ Sommit� della Verga Venerabile
Verga Venerabile Esaurita
Manipolatore d'Anima
@@ -370,8 +370,8 @@
Acqua Primaverile
- Un portale per la Terra Promessa apparto nel cielo, sopra di te.
- Un portale per l'Overworld apparto nel cielo, sopra di te.
+ Un portale per la Terra Promessa � apparto nel cielo, sopra di te.
+ Un portale per l'Overworld � apparto nel cielo, sopra di te.
Biomes O' Plenty
diff --git a/resources/assets/biomesoplenty/lang/nl_NL.xml b/resources/assets/biomesoplenty/lang/nl_NL.xml
index eaea03209..30cd49d79 100644
--- a/resources/assets/biomesoplenty/lang/nl_NL.xml
+++ b/resources/assets/biomesoplenty/lang/nl_NL.xml
@@ -45,7 +45,7 @@
Violet
Anemoon
Waterlely
- Aloë
+ Aloë
Zonnebloem
Zonnebloem
Paardebloem
diff --git a/resources/assets/biomesoplenty/lang/pl_PL.xml b/resources/assets/biomesoplenty/lang/pl_PL.xml
index 524eb0922..7d52aa26a 100644
--- a/resources/assets/biomesoplenty/lang/pl_PL.xml
+++ b/resources/assets/biomesoplenty/lang/pl_PL.xml
@@ -50,7 +50,7 @@
Zawilec
Lilia wodna
Chromaflora
- Aloes
+ Aloes
Słonecznik
Słonecznik
Dmuchawiec
diff --git a/resources/assets/biomesoplenty/lang/ru_RU.xml b/resources/assets/biomesoplenty/lang/ru_RU.xml
index da8dd206b..4a6663876 100644
--- a/resources/assets/biomesoplenty/lang/ru_RU.xml
+++ b/resources/assets/biomesoplenty/lang/ru_RU.xml
@@ -49,7 +49,7 @@
Белый анемон
Кувшинка
Радужный цветок
- Алоэ
+ Алоэ
Подсолнечник
Подсолнечник
Белый одуванчик
diff --git a/resources/assets/biomesoplenty/textures/blocks/aloe.png b/resources/assets/biomesoplenty/textures/blocks/bromeliad.png
similarity index 100%
rename from resources/assets/biomesoplenty/textures/blocks/aloe.png
rename to resources/assets/biomesoplenty/textures/blocks/bromeliad.png
diff --git a/resources/assets/biomesoplenty/textures/blocks/lavender.png b/resources/assets/biomesoplenty/textures/blocks/lavender.png
new file mode 100644
index 000000000..b9679f644
Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/lavender.png differ
diff --git a/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png b/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png
index b26bb0e6c..8618c7428 100644
Binary files a/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png and b/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png differ
diff --git a/resources/assets/biomesoplenty/textures/blocks/wildflower.png b/resources/assets/biomesoplenty/textures/blocks/wildflower.png
index adc0dbd99..15b2a83df 100644
Binary files a/resources/assets/biomesoplenty/textures/blocks/wildflower.png and b/resources/assets/biomesoplenty/textures/blocks/wildflower.png differ
diff --git a/resources/assets/biomesoplenty/textures/items/saladveggie.png b/resources/assets/biomesoplenty/textures/items/saladveggie.png
index 9f4342d13..9b98094bb 100644
Binary files a/resources/assets/biomesoplenty/textures/items/saladveggie.png and b/resources/assets/biomesoplenty/textures/items/saladveggie.png differ
diff --git a/resources/assets/biomesoplenty/textures/items/wildcarrots.png b/resources/assets/biomesoplenty/textures/items/wildcarrots.png
index 6f4437103..ef4227ce5 100644
Binary files a/resources/assets/biomesoplenty/textures/items/wildcarrots.png and b/resources/assets/biomesoplenty/textures/items/wildcarrots.png differ