2 files changed, 89 insertions, 2 deletions

diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index 0c1cb3265..7c3fa0b8e 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -307,6 +307,48 @@ EMCSBiome StringToBiome(const AString & a_BiomeString)
 		{biExtremeHillsEdge, "ExtremeHillsEdge"},
 		{biJungle,           "Jungle"},
 		{biJungleHills,      "JungleHills"},
+		
+		// Release 1.7 biomes:
+		{biJungleEdge,       "JungleEdge"},
+		{biDeepOcean,        "DeepOcean"},
+		{biStoneBeach,       "StoneBeach"},
+		{biColdBeach,        "ColdBeach"},
+		{biBirchForest,      "BirchForest"},
+		{biBirchForestHills, "BirchForestHills"},
+		{biRoofedForest,     "RoofedForest"},
+		{biColdTaiga,        "ColdTaiga"},
+		{biColdTaigaHills,   "ColdTaigaHills"},
+		{biMegaTaiga,        "MegaTaiga"},
+		{biMegaTaigaHills,   "MegaTaigaHills"},
+		{biExtremeHillsPlus, "ExtremeHillsPlus"},
+		{biSavanna,          "Savanna"},
+		{biSavannaPlateau,   "SavannaPlateau"},
+		{biMesa,             "Mesa"},
+		{biMesaPlateauF,     "MesaPlateauF"},
+		{biMesaPlateau,      "MesaPlateau"},
+		
+		// Release 1.7 variants:
+		{biSunflowerPlains,      "SunflowerPlains"},
+		{biDesertM,              "DesertM"},
+		{biExtremeHillsM,        "ExtremeHillsM"},
+		{biFlowerForest,         "FlowerForest"},
+		{biTaigaM,               "TaigaM"},
+		{biSwamplandM,           "SwamplandM"},
+		{biIcePlainsSpikes,      "IcePlainsSpikes"},
+		{biJungleM,              "JungleM"},
+		{biJungleEdgeM,          "JungleEdgeM"},
+		{biBirchForestM,         "BirchForestM"},
+		{biBirchForestHillsM,    "BirchForestHillsM"},
+		{biRoofedForestM,        "RoofedForestM"},
+		{biColdTaigaM,           "ColdTaigaM"},
+		{biMegaSpruceTaiga,      "MegaSpruceTaiga"},
+		{biMegaSpruceTaigaHills, "MegaSpruceTaigaHills"},
+		{biExtremeHillsPlusM,    "ExtremeHillsPlusM"},
+		{biSavannaM,             "SavannaM"},
+		{biSavannaPlateauM,      "SavannaPlateauM"},
+		{biMesaBryce,            "MesaBryce"},
+		{biMesaPlateauFM,        "MesaPlateauFM"},
+		{biMesaPlateauM,         "MesaPlateauM"},
 	} ;
 	
 	for (int i = 0; i < ARRAYCOUNT(BiomeMap); i++)
diff --git a/source/ChunkDef.h b/source/ChunkDef.h
index 4cc2d15b0..9db88f293 100644
--- a/source/ChunkDef.h
+++ b/source/ChunkDef.h
@@ -93,9 +93,54 @@ enum EMCSBiome
 	biJungle           = 21,
 	biJungleHills      = 22,
 	
-	// Automatically capture the maximum biome value into biMaxBiome:
+	// Release 1.7 biomes:
+	biJungleEdge       = 23,
+	biDeepOcean        = 24,
+	biStoneBeach       = 25,
+	biColdBeach        = 26,
+	biBirchForest      = 27,
+	biBirchForestHills = 28,
+	biRoofedForest     = 29,
+	biColdTaiga        = 30,
+	biColdTaigaHills   = 31,
+	biMegaTaiga        = 32,
+	biMegaTaigaHills   = 33,
+	biExtremeHillsPlus = 34,
+	biSavanna          = 35,
+	biSavannaPlateau   = 36,
+	biMesa             = 37,
+	biMesaPlateauF     = 38,
+	biMesaPlateau      = 39,
+	
+	// Automatically capture the maximum consecutive biome value into biMaxBiome:
 	biNumBiomes,  // True number of biomes, since they are zero-based
-	biMaxBiome = biNumBiomes - 1  // The maximum biome value
+	biMaxBiome = biNumBiomes - 1,  // The maximum biome value
+	
+	// Add this number to the biomes to get the variant
+	biVariant = 128,
+	
+	// Release 1.7 biome variants:
+	biSunflowerPlains      = 129,
+	biDesertM              = 130,
+	biExtremeHillsM        = 131,
+	biFlowerForest         = 132,
+	biTaigaM               = 133,
+	biSwamplandM           = 134,
+	biIcePlainsSpikes      = 140,
+	biJungleM              = 149,
+	biJungleEdgeM          = 151,
+	biBirchForestM         = 155,
+	biBirchForestHillsM    = 156,
+	biRoofedForestM        = 157,
+	biColdTaigaM           = 158,
+	biMegaSpruceTaiga      = 160,
+	biMegaSpruceTaigaHills = 161,
+	biExtremeHillsPlusM    = 162,
+	biSavannaM             = 163,
+	biSavannaPlateauM      = 164,
+	biMesaBryce            = 165,
+	biMesaPlateauFM        = 166,
+	biMesaPlateauM         = 167,
 } ;
 
 // tolua_end