Merge remote-tracking branch 'upstream/BOP-1.8.9-3.0.x' into BOP-1.8.9-3.0.x

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java

@@ -27,7 +27,7 @@ public class BiomeGenAlps extends BOPBiome
         
         this.setColor(13421772);
         this.setEnableSnow();
-        this.setTemperatureRainfall(0.0F, 0.5F);
+        this.setTemperatureRainfall(-0.5F, 0.3F);
 
         this.canGenerateRivers = false;
         this.canSpawnInBiome = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBambooForest.java

@@ -57,7 +57,7 @@ public class BiomeGenBambooForest extends BOPBiome
         this.terrainSettings.avgHeight(68).heightVariation(5, 10);
         
         this.setColor(0xA3E053);
-        this.setTemperatureRainfall(1.2F, 0.9F);
+        this.setTemperatureRainfall(0.85F, 0.9F);
 
         this.canGenerateVillages = false;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java

@@ -51,7 +51,7 @@ public class BiomeGenBayou extends BOPBiome
         this.terrainSettings.avgHeight(63).heightVariation(5, 10).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
         
         this.setColor(0x8BAF6B);
-        this.setTemperatureRainfall(0.8F, 0.9F);
+        this.setTemperatureRainfall(0.85F, 0.9F);
         this.waterColorMultiplier = 0xFFD932;
         //this.skyColor = 0xACC4BC;
         this.seaFloorBlock = BOPBlocks.mud.getDefaultState();

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java

@@ -34,7 +34,7 @@ public class BiomeGenBorealForest extends BOPBiome
         this.terrainSettings.avgHeight(70).heightVariation(15, 30);
 
         this.setColor(0x9FB771);
-        this.setTemperatureRainfall(0.5F, 0.6F);
+        this.setTemperatureRainfall(0.3F, 0.6F);
         this.addWeight(BOPClimates.BOREAL, 5);
 
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java

@@ -40,7 +40,7 @@ public class BiomeGenBrushland extends BOPBiome
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SANDY);
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SANDY);
         this.setColor(0xC6C19B);
-        this.setTemperatureRainfall(1.0F, 0.1F);
+        this.setTemperatureRainfall(1.5F, 0.1F);
         this.addWeight(BOPClimates.SAVANNA, 10);
         
         this.canGenerateVillages = true;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCanyon.java

@@ -45,7 +45,7 @@ public class BiomeGenCanyon extends BOPBiome
         }
 
         this.setColor(0xB49C70);
-        this.setTemperatureRainfall(1.0F, 0.3F);
+        this.setTemperatureRainfall(1.2F, 0.3F);
         
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java

@@ -43,7 +43,7 @@ public class BiomeGenCherryBlossomGrove extends BOPBiome
         this.terrainSettings.avgHeight(63).heightVariation(5, 25).sidewaysNoise(0.8F);
         
         this.setColor(0xF88F8F);
-        this.setTemperatureRainfall(0.6F, 0.8F);
+        this.setTemperatureRainfall(0.55F, 0.8F);
         
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java

@@ -57,14 +57,15 @@ public class BiomeGenColdDesert extends BOPBiome
         if (type == ColdDesertType.FROZEN)
         {
         	this.alternateTopBlock = BOPBlocks.hard_ice.getDefaultState();
-            this.setTemperatureRainfall(0.0F, 0.0F);
+            this.setTemperatureRainfall(-0.5F, 0.0F);
             this.addWeight(BOPClimates.ICE_CAP, 10);
             this.setColor(0xB3D7E3);
         }
         else
         {
         	this.alternateTopBlock = Blocks.snow.getDefaultState();
-            this.setTemperatureRainfall(0.2F, 0.0F);
+            this.setTemperatureRainfall(0.0F, 0.0F);
+            this.enableSnow = false;
             this.addWeight(BOPClimates.ICE_CAP, 10);
             this.setColor(0xB3AF9B);
         }

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java

@@ -40,7 +40,7 @@ public class BiomeGenConiferousForest extends BOPBiome
         this.terrainSettings.avgHeight(68).heightVariation(10, 20);
         
         this.setColor(0x528F60);
-        this.setTemperatureRainfall(0.5F, 0.5F);
+        this.setTemperatureRainfall(0.45F, 0.5F);
         
         this.canGenerateVillages = false;
     

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java

@@ -24,7 +24,7 @@ public class BiomeGenCrag extends BOPBiome
         this.terrainSettings.avgHeight(80).heightVariation(80, 200).minHeight(40).sidewaysNoise(0.7F);
         
         this.setColor(5209457);
-        this.setTemperatureRainfall(0.9F, 0.5F);
+        this.setTemperatureRainfall(0.5F, 0.5F);
 
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java

@@ -45,7 +45,7 @@ public class BiomeGenDeadForest extends BOPBiome
         this.canGenerateVillages = false;
         
         this.setColor(0xBCA165);
-        this.setTemperatureRainfall(0.4F, 0.3F);
+        this.setTemperatureRainfall(0.3F, 0.3F);
         
         this.addWeight(BOPClimates.BOREAL, 3);
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java

@@ -48,7 +48,7 @@ public class BiomeGenDeadSwamp extends BOPBiome
         // terrain
         this.terrainSettings.avgHeight(63).heightVariation(6, 3);
 
-        this.setTemperatureRainfall(0.7F, 0.9F);
+        this.setTemperatureRainfall(0.55F, 0.9F);
         this.setColor(0x8BAF48);
         this.waterColorMultiplier = 0xA2AD51;
         //this.skyColor = 0x627268;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java

@@ -40,7 +40,7 @@ public class BiomeGenEucalyptusForest extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(10, 20); 
         
         this.setColor(0x9DCC70);
-        this.setTemperatureRainfall(0.9F, 0.9F);
+        this.setTemperatureRainfall(0.85F, 0.9F);
         
         this.canGenerateVillages = false;
 

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFrostForest.java

@@ -42,7 +42,7 @@ public class BiomeGenFrostForest extends BOPBiome
         this.setColor(0xABD6BC);
         //this.skyColor = 0xCEE0EA;
         this.setEnableSnow();
-        this.setTemperatureRainfall(0.0F, 0.5F);
+        this.setTemperatureRainfall(-0.25F, 0.5F);
         
         this.canGenerateVillages = false;
 

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFungiForest.java

@@ -52,7 +52,7 @@ public class BiomeGenFungiForest extends BOPBiome
         this.setColor(0xF0F970);
         this.skyColor = 0x73C69E;
         this.waterColorMultiplier = 0x00FF2E;
-        this.setTemperatureRainfall(0.5F, 0.5F);
+        this.setTemperatureRainfall(0.8F, 0.9F);
         
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGarden.java

@@ -44,7 +44,7 @@ public class BiomeGenGarden extends BOPBiome
         this.terrainSettings.avgHeight(66).heightVariation(6, 14).octaves(0, 0, 1, 1, 2, 2);
         
         this.setColor(0x74D374);
-        this.setTemperatureRainfall(0.7F, 0.8F);
+        this.setTemperatureRainfall(0.6F, 0.8F);
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.DAISY);
 
         this.canSpawnInBiome = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrove.java

@@ -40,7 +40,7 @@ public class BiomeGenGrove extends BOPBiome
         this.terrainSettings.avgHeight(66).heightVariation(8, 20).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
         
         this.setColor(0x517F51);
-        this.setTemperatureRainfall(0.7F, 0.8F);
+        this.setTemperatureRainfall(0.55F, 0.8F);
         
         this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHeathland.java

@@ -48,7 +48,7 @@ public class BiomeGenHeathland extends BOPBiome
         this.terrainSettings.avgHeight(65).heightVariation(5, 15).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
         
         this.setColor(0xADAE68);
-        this.setTemperatureRainfall(0.7F, 0.05F);
+        this.setTemperatureRainfall(0.75F, 0.05F);
         
         this.addWeight(BOPClimates.DRY_TEMPERATE, 5);
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenHighland.java

@@ -33,7 +33,7 @@ public class BiomeGenHighland extends BOPBiome
         this.terrainSettings.avgHeight(120).heightVariation(25, 25);
         
         this.setColor(0x7CAD66);
-        this.setTemperatureRainfall(0.5F, 0.8F);
+        this.setTemperatureRainfall(0.55F, 0.8F);
         
         this.canGenerateRivers = false;
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLavenderFields.java

@@ -36,7 +36,7 @@ public class BiomeGenLavenderFields extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(4, 12); 
         
         this.setColor(11035852);
-        this.setTemperatureRainfall(0.6F, 0.7F);
+        this.setTemperatureRainfall(0.7F, 0.7F);
     
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLushDesert.java

@@ -46,7 +46,7 @@ public class BiomeGenLushDesert extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(4, 15);
         
         this.setColor(0x8AA92D);
-        this.setTemperatureRainfall(1.1F, 0.5F);
+        this.setTemperatureRainfall(1.2F, 0.5F);
         this.topBlock = Blocks.hardened_clay.getDefaultState();
         this.fillerBlock = Blocks.hardened_clay.getDefaultState();
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMapleWoods.java

@@ -35,7 +35,7 @@ public class BiomeGenMapleWoods extends BOPBiome
         this.terrainSettings.avgHeight(70).heightVariation(10, 25);
 
         this.setColor(0x6AA369);
-        this.setTemperatureRainfall(0.2F, 0.8F);
+        this.setTemperatureRainfall(0.25F, 0.8F);
         this.addWeight(BOPClimates.BOREAL, 10);
 
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMarsh.java

@@ -50,7 +50,7 @@ public class BiomeGenMarsh extends BOPBiome
         this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
         this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
         this.setColor(0x66A06E);
-        this.setTemperatureRainfall(0.5F, 0.9F);
+        this.setTemperatureRainfall(0.7F, 0.9F);
         
         this.canSpawnInBiome = false;
         this.canGenerateRivers = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java

@@ -37,9 +37,10 @@ public class BiomeGenMeadow extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(5, 5).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
 
         this.setColor(0x63B26D);
-        this.setTemperatureRainfall(0.7F, 0.7F);
+        this.setTemperatureRainfall(0.45F, 0.7F);
 
-        this.addWeight(BOPClimates.COOL_TEMPERATE, 10);
+        this.addWeight(BOPClimates.COOL_TEMPERATE, 3);
+        this.addWeight(BOPClimates.BOREAL, 7);
         
         this.canGenerateVillages = true;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java

@@ -38,7 +38,7 @@ public class BiomeGenMoor extends BOPBiome
         // terrain
         this.terrainSettings.avgHeight(88).heightVariation(8, 10).octaves(0, 1, 1, 3, 1, 0);
         
-        this.setTemperatureRainfall(0.5F, 1.0F);
+        this.setTemperatureRainfall(0.55F, 1.0F);
         this.setColor(0x619365);
         this.waterColorMultiplier = 0x588276;
         //this.skyColor =0xA0C5D3;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java

@@ -78,7 +78,7 @@ public class BiomeGenMountain extends BOPBiome
         this.canSpawnInBiome = false;
         this.canGenerateVillages = false;
         this.setColor(0x80A355);
-        this.setTemperatureRainfall(0.5F, 0.1F);
+        this.setTemperatureRainfall(0.3F, 0.1F);
         
         if (type == MountainType.PEAKS)
         {

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java

@@ -52,7 +52,7 @@ public class BiomeGenMysticGrove extends BOPBiome
         
         this.setColor(0x69CFDB);
         this.skyColor = 0x88E8D0;
-        this.setTemperatureRainfall(0.7F, 1.0F);
+        this.setTemperatureRainfall(0.6F, 0.8F);
         this.waterColorMultiplier = 0xFF107A;
 
         this.canGenerateRivers = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java

@@ -59,7 +59,7 @@ public class BiomeGenOminousWoods extends BOPBiome
         
         this.setColor(0x3F4151);
         this.skyColor = 0x34333D;
-        this.setTemperatureRainfall(0.5F, 0.9F);
+        this.setTemperatureRainfall(0.45F, 0.6F);
         this.waterColorMultiplier = 0x1E1B26;
 
         this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOriginValley.java

@@ -31,7 +31,7 @@ public class BiomeGenOriginValley extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(6, 25).sidewaysNoise(0.0D);
         
         this.setColor(10341485);
-        this.setTemperatureRainfall(0.7F, 0.8F);
+        this.setTemperatureRainfall(0.6F, 0.6F);
         this.skyColor = 8441086;
         
         this.canSpawnInBiome = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java

@@ -34,7 +34,7 @@ public class BiomeGenOutback extends BOPBiome
         // terrain
         this.terrainSettings.avgHeight(72).heightVariation(8, 10).octaves(0, 1, 2, 1, 0, 2);
         
-        this.setTemperatureRainfall(1.3F, 0.05F);
+        this.setTemperatureRainfall(1.5F, 0.05F);
         this.setColor(0xA57644);
         this.topBlock = Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND);
         this.fillerBlock = Blocks.sand.getDefaultState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND);

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOvergrownCliffs.java

@@ -39,7 +39,7 @@ public class BiomeGenOvergrownCliffs extends BOPBiome
         this.terrainSettings.avgHeight(70).heightVariation(5, 100).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
         
         this.setColor(8373350);
-        this.setTemperatureRainfall(0.8F, 0.7F);
+        this.setTemperatureRainfall(0.9F, 0.7F);
 
         this.canGenerateRivers = false;
         this.canSpawnInBiome = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenQuagmire.java

@@ -42,7 +42,7 @@ public class BiomeGenQuagmire extends BOPBiome
         this.terrainSettings.avgHeight(63).heightVariation(5, 10).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
         
         this.setColor(0x503A2B);
-        this.setTemperatureRainfall(0.8F, 0.9F);
+        this.setTemperatureRainfall(0.55F, 0.9F);
         this.topBlock = BOPBlocks.mud.getDefaultState();
         this.fillerBlock = BOPBlocks.mud.getDefaultState();
         this.waterColorMultiplier = 0xCC5100;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRainforest.java

@@ -40,7 +40,7 @@ public class BiomeGenRainforest extends BOPBiome
         this.terrainSettings.avgHeight(80).heightVariation(50, 50).sidewaysNoise(1.5D);
 
         this.setColor(0x14E26F);
-        this.setTemperatureRainfall(1.0F, 1.0F);
+        this.setTemperatureRainfall(0.95F, 1.2F);
         this.addWeight(BOPClimates.TROPICAL, 7);
         
         this.canSpawnInBiome = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSacredSprings.java

@@ -39,7 +39,7 @@ public class BiomeGenSacredSprings extends BOPBiome
         this.terrainSettings.avgHeight(62).heightVariation(11, 45);
         
         this.setColor(39259);
-        this.setTemperatureRainfall(1.2F, 0.9F);
+        this.setTemperatureRainfall(0.8F, 0.9F);
         
         this.canSpawnInBiome = false;
         this.canGenerateRivers = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java

@@ -35,7 +35,7 @@ public class BiomeGenSeasonalForest extends BOPBiome
         this.terrainSettings.avgHeight(70).heightVariation(10, 30);
 
         this.setColor(0xBEC44C);
-        this.setTemperatureRainfall(0.5F, 0.8F);
+        this.setTemperatureRainfall(0.4F, 0.8F);
         this.addWeight(BOPClimates.COOL_TEMPERATE, 7);
 
         this.canGenerateVillages = false;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java

@@ -59,7 +59,7 @@ public class BiomeGenShield extends BOPBiome
         this.terrainSettings.avgHeight(63).heightVariation(10, 10).sidewaysNoise(0.1D).octaves(1, 4, 3, 1, 1, 0);
         
         this.setColor(0x647F38);
-        this.setTemperatureRainfall(0.5F, 0.8F);
+        this.setTemperatureRainfall(0.3F, 0.8F);
         
         this.topBlock = Blocks.grass.getDefaultState();
         this.usualTopBlock = this.topBlock;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSnowyConiferousForest.java

@@ -38,7 +38,7 @@ public class BiomeGenSnowyConiferousForest extends BOPBiome
         
         this.setColor(0xFFFFFF);
         this.setEnableSnow();
-        this.setTemperatureRainfall(0.0F, 0.5F);
+        this.setTemperatureRainfall(-0.25F, 0.5F);
     
         this.canGenerateVillages = false;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSteppe.java

@@ -52,7 +52,7 @@ public class BiomeGenSteppe extends BOPBiome
         this.terrainSettings.avgHeight(70).heightVariation(6, 20).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D); 
         
         this.setColor(13413215);
-        this.setTemperatureRainfall(0.7F, 0.05F);
+        this.setTemperatureRainfall(0.9F, 0.1F);
         
         this.canSpawnInBiome = false;
         this.canGenerateVillages = true;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java

@@ -48,7 +48,7 @@ public class BiomeGenTemperateRainforest extends BOPBiome
         this.terrainSettings.avgHeight(63).heightVariation(10, 35);
         
         this.setColor(0xBBDD63);
-        this.setTemperatureRainfall(0.8F, 1.2F);
+        this.setTemperatureRainfall(0.75F, 1.2F);
         
         this.canGenerateVillages = false;
     

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWasteland.java

@@ -50,7 +50,7 @@ public class BiomeGenWasteland extends BOPBiome
         this.terrainSettings.avgHeight(66).heightVariation(1,5);
         
         this.setColor(0x5A5440);
-        this.setTemperatureRainfall(0.9F, 0.05F);
+        this.setTemperatureRainfall(2.0F, 0.05F);
         this.topBlock = BOPBlocks.dried_sand.getDefaultState();
         this.fillerBlock = BOPBlocks.dried_sand.getDefaultState();
         this.waterColorMultiplier = 0xE5FF00;

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java

@@ -54,7 +54,7 @@ public class BiomeGenWetland extends BOPBiome
         this.terrainSettings.avgHeight(63).heightVariation(5, 15).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
         
         this.setColor(0x4F9657);
-        this.setTemperatureRainfall(0.6F, 0.9F);
+        this.setTemperatureRainfall(0.6F, 0.7F);
         this.waterColorMultiplier = 0x636084;
         this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
 

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java

@@ -46,7 +46,7 @@ public class BiomeGenWoodland extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(6, 25);
         
         this.setColor(0x84A92D);
-        this.setTemperatureRainfall(0.6F, 0.3F);
+        this.setTemperatureRainfall(0.7F, 0.5F);
         
         this.canGenerateVillages = false;
         

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java

@@ -53,7 +53,7 @@ public class BiomeGenXericShrubland extends BOPBiome
         this.terrainSettings.avgHeight(64).heightVariation(1, 5);
         
         this.setColor(0xE2CDA5);
-        this.setTemperatureRainfall(1.1F, 0.1F);
+        this.setTemperatureRainfall(1.5F, 0.1F);
         this.topBlock = Blocks.sand.getDefaultState();
         this.fillerBlock = Blocks.sand.getDefaultState();
         this.usualTopBlock = this.topBlock;

src/main/resources/assets/biomesoplenty/lang/zh_TW.lang

@@ -51,6 +51,13 @@ biome_finder.searching=正在尋找%s…
 biome_finder.found=找到了%s！
 biome_finder.not_found=無法找到%s，可能是距離該生態系過遠。
 
+config.category.convenienceSettings.title=便捷設定
+config.category.guiSettings.title=GUI設定
+config.category.textureSettings.title=材質設定
+config.category.convenienceSettings.tooltip=需使用剪刀採取花朵
+config.category.guiSettings.tooltip=生成世界時以 Biomes O' Plenty 世界類型作為預設選項。
+config.category.textureSettings.tooltip=覆寫寫 Forge bucket 材質，使用我們的版本！(It's nicer!)
+
 commands.biomesoplenty.usage=/biomesoplenty <tpbiome|biomename|stripchunk> [args]
 commands.biomesoplenty.biomename.usage=/biomesoplenty biomename [biomeId]
 commands.biomesoplenty.biomename.success=Biome ID %s is associated with %s
@@ -174,7 +181,6 @@ item.turnip_seeds.name=蕪菁種子
 item.umbran_door.name=暗影木門
 item.wading_boots.name=涉水靴
 item.white_dye.name=白染料
-item.wildcarrots.name=野生胡蘿蔔
 item.willow_door.name=柳木門
 item.wood_scythe.name=木鐮
 
@@ -194,7 +200,6 @@ tile.coral.orange_coral.name=橙色珊瑚
 tile.coral.blue_coral.name=藍色珊瑚
 tile.coral.glowing_coral.name=發光珊瑚
 tile.coral.algae.name=水藻
-tile.crag_rock_slab.name=峭岩半磚
 tile.dirt.loamy_dirt.name=壤質土
 tile.dirt.sandy_dirt.name=砂質土
 tile.dirt.silty_dirt.name=淤泥土
@@ -208,6 +213,9 @@ tile.ethereal_fence.name=空靈木柵欄
 tile.ethereal_fence_gate.name=空靈木柵欄門
 tile.ethereal_wood_slab.name=空靈木半磚
 tile.ethereal_stairs.name=空靈木階梯
+tile.farmland_0.loamy_farmland.name=壤質耕地
+tile.farmland_0.sandy_farmland.name=砂質耕地
+tile.farmland_1.silty_farmland.name=泥質耕地
 tile.fir_fence.name=冷杉柵欄
 tile.fir_fence_gate.name=冷杉柵欄們
 tile.fir_wood_slab.name=冷杉半磚
@@ -298,7 +306,6 @@ tile.leaves_5.pine_leaves.name=松葉
 tile.leaves_5.mahogany_leaves.name=桃花心木葉
 tile.leaves_5.red_big_flower_petal.name=巨紅花瓣
 tile.leaves_5.yellow_big_flower_petal.name=巨黃花瓣
-tile.limestone_slab.name=石灰半磚
 tile.log_0.sacred_oak_log.name=聖橡木原木
 tile.log_0.cherry_log.name=櫻木原木
 tile.log_0.umbran_log.name=暗影原木
@@ -384,16 +391,13 @@ tile.plant_1.thorn.name=荊棘
 tile.plant_1.wildrice.name=野稻
 tile.plant_1.cattail.name=香蒲
 tile.plant_1.rivercane.name=箭竹
-tile.plant_1.wildcarrot_block.name=野生胡蘿蔔
+tile.plant_1.caveweed.name=洞穴雜草
 tile.plant_1.tinycactus.name=迷你仙人掌
 tile.plant_1.witherwart.name=凋萎疣
 tile.plant_1.reed.name=蘆葦
 tile.plant_1.root.name=根
 tile.plant_1.rafflesia.name=霸王花
 tile.plant_1.wisteria.name=紫藤花
-tile.polished_limestone_slab.name=平滑石灰半磚
-tile.polished_siltstone_slab.name=平滑泥岩半磚
-tile.polished_shale_slab.name=平滑頁岩半磚
 tile.redwood_fence.name=紅木柵欄
 tile.redwood_fence_gate.name=紅木柵欄門
 tile.redwood_wood_slab.name=紅木半磚
@@ -425,16 +429,12 @@ tile.sapling_2.willow_sapling.name=柳樹樹苗
 tile.sapling_2.pine_sapling.name=松樹樹苗
 tile.sapling_2.mahogany_sapling.name=桃花心木樹苗
 tile.seaweed.kelp.name=海帶
-tile.shale_slab.name=頁岩半磚
-tile.siltstone_slab.name=泥岩半磚
 tile.stone.limestone.name=石灰岩半磚
 tile.stone.polished_limestone.name=平滑石灰岩
 tile.stone.siltstone.name=泥岩
 tile.stone.polished_siltstone.name=平滑泥岩
 tile.stone.shale.name=頁岩
 tile.stone.polished_shale.name=平滑頁岩
-tile.stone_formations.stalagmite.name=石筍
-tile.stone_formations.stalactite.name=鐘乳石
 tile.terrarium.terrarium_fern.name=蕨培養罐
 tile.terrarium.terrarium_mushroom.name=蘑菇培養罐
 tile.terrarium.terrarium_cactus.name=仙人掌培養罐
@@ -465,11 +465,8 @@ tile.willow_fence.name=柳木柵欄
 tile.willow_fence_gate.name=柳木柵欄門
 tile.willow_wood_slab.name=柳木半磚
 tile.willow_stairs.name=柳木樓梯
-tile.ash_stone.name=灰燼石
-tile.hard_sand.name=硬質沙
-tile.hard_dirt.name=硬質土
 tile.hard_ice.name=硬質冰
-tile.dried_dirt.name=乾土
+tile.dried_sand.name=乾沙
 tile.crag_rock.name=峭岩
 tile.mud_brick.name=泥磚
 tile.crystal.name=星晶