57 files changed, 4978 insertions, 923 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66281fe0c..d4e9d41e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,21 @@ if(DEFINED ENV{MCSERVER_BUILD_ID})
 	endif()
 endif()
 
+# We need C++11 features, Visual Studio has those from VS2012, but it needs a new platform toolset for those; VS2013 supports them natively:
+# Adapted from http://binglongx.wordpress.com/2013/06/28/set-non-default-platform-toolset-in-cmake/
+if(MSVC OR MSVC_IDE)
+  if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
+    message(FATAL_ERROR "The project requires C++11 features. "
+      "You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
+      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
+  elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
+    message( "VC11: using Microsoft Visual Studio 2012 "
+      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
+    set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
+  else() # VC12+, assuming C++11 supported.
+  endif()
+endif()
+
 # This has to be done before any flags have been set up.
 if(${BUILD_TOOLS})
 	add_subdirectory(Tools/MCADefrag/)
diff --git a/MCServer/Plugins/APIDump/Classes/Projectiles.lua b/MCServer/Plugins/APIDump/Classes/Projectiles.lua
index aef6a048c..748f58b71 100644
--- a/MCServer/Plugins/APIDump/Classes/Projectiles.lua
+++ b/MCServer/Plugins/APIDump/Classes/Projectiles.lua
@@ -123,35 +123,47 @@ return
 
 	cSplashPotionEntity =
 	{
-		Desc = "",
-		Functions = {},
+		Desc = [[
+			Represents a thrown splash potion.
+		]],
+			Functions =
+			{
+				GetEntityEffect = { Params = "", Return = "{{cEntityEffect}}", Notes = "Returns the entity effect in this potion" },
+				GetEntityEffectType = { Params = "", Return = "{{cEntityEffect|Entity effect type}}", Notes = "Returns the effect type of this potion" },
+				GetPotionColor = { Params = "", Return = "number", Notes = "Returns the color index of the particles emitted by this potion" },
+				SetEntityEffect = { Params = "{{cEntityEffect}}", Return = "", Notes = "Sets the entity effect for this potion" },
+				SetEntityEffectType = { Params = "{{cEntityEffect|Entity effect type}}", Return = "", Notes = "Sets the effect type of this potion" },
+				SetPotionColor = { Params = "number", Return = "", Notes = "Sets the color index of the particles for this potion" },
+			},
 		Inherits = "cProjectileEntity",
 	},  -- cSplashPotionEntity
 
 	cThrownEggEntity =
 	{
-		Desc = "",
+		Desc = [[
+			Represents a thrown egg.
+		]],
 		Functions = {},
 		Inherits = "cProjectileEntity",
 	},  -- cThrownEggEntity
 
 	cThrownEnderPearlEntity =
 	{
-		Desc = "",
+		Desc = "Represents a thrown ender pearl.",
 		Functions = {},
 		Inherits = "cProjectileEntity",
 	},  -- cThrownEnderPearlEntity
 	
 	cThrownSnowballEntity =
 	{
-		Desc = "",
+		Desc = "Represents a thrown snowball.",
 		Functions = {},
 		Inherits = "cProjectileEntity",
 	},  -- cThrownSnowballEntity
 
 	cWitherSkullEntity =
 	{
-		Desc = "",
+		Desc = "Represents a wither skull being shot.",
 		Functions = {},
 		Inherits = "cProjectileEntity",
 	},  -- cWitherSkullEntity
diff --git a/MCServer/webadmin/files/guest.html b/MCServer/webadmin/files/guest.html
new file mode 100644
index 000000000..7ae78a3f0
--- /dev/null
+++ b/MCServer/webadmin/files/guest.html
@@ -0,0 +1,2 @@
+Hello! Welcome to the MCServer WebAdmin.<br>
+This is a default message, edit <b>files/guest.html</b> to add your own custom message.
diff --git a/MCServer/webadmin/files/header.png b/MCServer/webadmin/files/header.png
new file mode 100644
index 000000000..97b067715
--- /dev/null
+++ b/MCServer/webadmin/files/header.png
diff --git a/MCServer/webadmin/files/home.gif b/MCServer/webadmin/files/home.gif
new file mode 100644
index 000000000..b10e0bed7
--- /dev/null
+++ b/MCServer/webadmin/files/home.gif
diff --git a/MCServer/webadmin/files/loading.gif b/MCServer/webadmin/files/loading.gif
new file mode 100644
index 000000000..b8d06f669
--- /dev/null
+++ b/MCServer/webadmin/files/loading.gif
diff --git a/MCServer/webadmin/files/log_out.png b/MCServer/webadmin/files/log_out.png
new file mode 100644
index 000000000..63232417a
--- /dev/null
+++ b/MCServer/webadmin/files/log_out.png
diff --git a/MCServer/webadmin/files/login.css b/MCServer/webadmin/files/login.css
new file mode 100644
index 000000000..5d87da4c5
--- /dev/null
+++ b/MCServer/webadmin/files/login.css
@@ -0,0 +1,219 @@
+/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+* {
+    margin: 0;
+}
+
+body {
+    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+    -webkit-font-smoothing: antialiased;
+    background: #fff url(header.png) repeat-x top left;
+    width: 100%;
+    min-width: 100%;
+    overflow: hidden;
+}
+
+a:link {
+    color: #555;
+    text-decoration: none;
+}
+
+a:visited {
+    color: #444;
+    text-decoration: none;
+}
+
+a:hover, a:active {
+    color: #000;
+    text-decoration: underline;
+}
+
+img {
+    border: none;
+}
+
+h1 {
+    color: #069;
+}
+
+.row1 {
+    border-bottom: 1px solid #000;
+    height: 100px;
+    max-height: 100px;
+}
+
+.row2 {
+    margin: 0 auto;
+    text-align: center;
+    vertical-align: middle;
+}
+
+.contention {
+    color: #000;
+    text-align: left;
+    line-height: 1.4;
+    margin: 0;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    font-size: 13px;
+}
+
+button {
+    background: #fff;
+    color: #000;
+    border: 1px solid #ccc;
+    padding: 3px;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    margin: -3px 0;
+}
+
+button:hover {
+    border-top-color: #28597a;
+    background: #28597a;
+    color: #ccc;
+}
+
+button:active {
+    border-top-color: #1b435e;
+    background: #1b435e;
+}
+
+.push10 {
+    padding-bottom: 75px;
+}
+
+#panel .upper {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    border-top: 1px solid #fff;
+    border-bottom: 1px solid #bbb;
+    padding: 7px;
+}
+
+#footer {
+    z-index: 99999;
+}
+
+#footer ul.menu {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+#footer ul.menu li {
+    margin: 0 5px;
+    display: inline;
+}
+
+#footer .upper {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    border-top: 1px solid #bbb;
+    padding: 6px;
+    overflow: hidden;
+    font-size: 12px;
+}
+
+#footer .upper ul.bottom_links {
+    float: left;
+    margin: 3px 0 0 -5px;
+}
+
+#footer .lower {
+    background: #a1a2a2 url(thead.png) top left repeat-x;
+    color: #fff;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ddd;
+    overflow: hidden;
+    padding: 8px;
+    font-size: 11px;
+}
+
+#footer .lower a:link, #footer .lower a:visited {
+    color: #fff;
+    font-weight: 700;
+}
+
+#footer .lower a:hover, #footer .lower a:active {
+    color: #fff;
+    font-weight: 700;
+}
+
+#footer .lower #current_time {
+    float: right;
+    padding-right: 6px;
+}
+
+.wrapper {
+    width: 85%;
+    min-width: 970px;
+    max-width: 1500px;
+    margin: auto;
+}
+
+#footer {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 60px;
+    width: 100%;
+    background: #999;
+    border-top: 1px #000 solid;
+}
+
+* html #footer {
+    position: absolute;
+    top: expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px');
+}
+
+tr td.trow2:first-child {
+    border-left: 0;
+}
+
+tr td.trow2:last-child {
+    border-right: 0;
+}
+
+.tborder {
+    -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
+    border-radius: 7px;
+}
+
+.thead, .rounded_top {
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+}
+
+table {
+    color: #000;
+    font-size: 13px;
+}
+
+.tborder {
+    background: #fff;
+    width: 100%;
+    margin: auto;
+    border: 1px solid #ccc;
+    padding: 1px;
+}
+
+.thead {
+    background: #a1a2a2 url(thead.png) top left repeat-x;
+    color: #fff;
+    border-bottom: 1px solid #8e8f8f;
+    padding: 8px;
+}
+
+.trow2 {
+    background: #efefef;
+    border: 1px solid;
+    border-color: #fff #ddd #ddd #fff;
+}
+
+.padtopp {
+    padding-top: 25px;
+}
diff --git a/MCServer/webadmin/files/login.gif b/MCServer/webadmin/files/login.gif
new file mode 100644
index 000000000..ce2cb6fc0
--- /dev/null
+++ b/MCServer/webadmin/files/login.gif
diff --git a/MCServer/webadmin/files/logo_login.png b/MCServer/webadmin/files/logo_login.png
new file mode 100644
index 000000000..d2155f928
--- /dev/null
+++ b/MCServer/webadmin/files/logo_login.png
diff --git a/MCServer/webadmin/files/pmfolder.gif b/MCServer/webadmin/files/pmfolder.gif
new file mode 100644
index 000000000..3fc68fdcb
--- /dev/null
+++ b/MCServer/webadmin/files/pmfolder.gif
diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
index 7f01b34b2..541cd389a 100644
--- a/MCServer/webadmin/files/style.css
+++ b/MCServer/webadmin/files/style.css
@@ -1,353 +1,433 @@
-body, html
-{
-	font-family: "Open Sans", Tahoma, sans-serif;
-	padding: 0;
-	margin: 0;
-	font-weight: 400;
-	background-color: #fbe9e7;
-	color: rgba(0, 0, 0, 0.87);
+/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+* {
+    margin: 0;
 }
 
-.light { font-weight: 300; }
-.bold { font-weight: 600; }
+body {
+    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+    -webkit-font-smoothing: antialiased;
+    background: #fff;
+    width: 100%;
+    min-width: 100%;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
 
-#wrapper
-{
-	background-color: #ff5722;
-	margin: 40px auto;
-	width: 99%;
-	max-width: 1200px;
-	box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-shadow: 0px 4px 5px rgba(0, 0, 0, 0.15);
-	color: rgba(0, 0, 0, 0.87);
+a:link {
+    color: #555;
+    text-decoration: none;
 }
 
-.title
-{
-	font-size: 30pt;
-	padding: 10px 40px;
-	text-decoration: none;
-	color: white;
-	text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
-	display: block;
+a:visited {
+    color: #444;
+    text-decoration: none;
 }
 
-#sidebar
-{
-	float: left;
-	width: 20%;
+a:hover, a:active {
+    color: #000;
+    text-decoration: underline;
 }
 
-.sideNav
-{
-	list-style: none;
-	background-color: #fafafa;
-	margin: 20px 0;
-	padding: 5px 0;
-	width: 100%;
-	box-shadow: 1px 0px 10px rgba(0, 0, 0, 0.2);
+img {
+    border: none;
 }
 
-.sideNav li
-{
-	padding: 10px;
-	color: rgba(0, 0, 0, 0.54);
+h1 {
+    color: #069;
+    text-shadow: 2px 2px #000;
 }
 
-.sideNav li.link
-{
-	padding-left: 30px;
+.row1 {
+    border-bottom: 1px #000 solid;
+    height: 100px;
+    max-height: 100px;
+    background: #fff url(header.png) repeat-x top left;
 }
 
-.sideNav li.link a
-{
-	text-decoration: none;
-	color: rgba(0, 0, 0, 0.87);
+.row2 {
+    margin: 0 auto;
+    text-align: center;
+    vertical-align: middle;
+    margin-top: 125px;
 }
 
-#container
-{
-	margin: 0;
-	padding: 0;
-	overflow: hidden;
-	background-color: #f5f5f5;
+.contention {
+    color: #000;
+    text-align: left;
+    line-height: 1.4;
+    margin: 0;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    font-size: 13px;
 }
 
-#main
-{
-	float: right;
-	width: 80%;
-	padding: 0 15px 20px 15px;
-	box-sizing: border-box;
-	-moz-box-sizing: border-box;
+.push10 {
+    padding-bottom: 75px;
 }
 
-.clear
-{
-	clear: both;
+#panel ul.menu {
+    margin: 0;
+    padding: 0;
+    list-style: none;
 }
 
-table
-{
-	width: 100%;
-	border-collapse: collapse;
+#panel ul.menu li {
+    margin: 0 5px;
+    display: inline;
 }
 
-table td
-{
-	padding: 5px;
+#panel ul.menu li a {
+    padding-left: 20px;
+    background-repeat: no-repeat;
+    background-position: left center;
 }
 
-table th
-{
-	border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-	padding: 5px;
-	text-align: center;
+#panel .upper ul.top_links {
+    float: right;
+    font-weight: 700;
 }
 
-table tr:nth-child(odd)
-{
-	background-color: rgba(0, 0, 0, 0.015);
+#panel .upper {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    border-top: 1px solid #fff;
+    border-bottom: 1px solid #bbb;
+    padding: 7px;
 }
 
-p
-{
-	margin: 8px 0;
-	padding: 8px 3px;
+#footer {
+    z-index: 99999;
 }
 
-a
-{
-	text-decoration: none;
-	color: #0277bd;
-	-webkit-transition: color 0.1s linear;
-	-moz-transition: color 0.1s linear;
-	transition: color 0.1s linear;
+#footer ul.menu {
+    margin: 0;
+    padding: 0;
+    list-style: none;
 }
 
-a:hover
-{
-	color: #01579b;
+#footer ul.menu li {
+    margin: 0 5px;
+    display: inline;
 }
 
-.welcome-msg
-{
-	color: rgba(0, 0, 0, 0.54);
+#footer .upper {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    border-top: 1px solid #bbb;
+    padding: 6px;
+    overflow: hidden;
+    font-size: 12px;
 }
 
-.username
-{
-	text-transform: capitalize;
-	color: rgba(0, 0, 0, 0.87);
+#footer .upper ul.bottom_links {
+    float: left;
+    margin: 3px 0 0 -5px;
 }
 
-a:hover
-{
-	color: black;
+#footer .lower {
+    background: #a1a2a2 url(thead.png) top left repeat-x;
+    color: #fff;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ddd;
+    overflow: hidden;
+    padding: 8px;
+    font-size: 11px;
 }
 
-input, select
-{
-	padding: 8px;
+#footer .lower a:link,#footer .lower a:visited {
+    color: #fff;
+    font-weight: 700;
 }
 
-form
-{
-	padding: 4px;
+#footer .lower a:hover,#footer .lower a:active {
+    color: #fff;
+    font-weight: 700;
 }
 
-.info input[type="submit"], .info button, .info input[type="button"],
-.warn input[type="submit"], .warn button, .warn input[type="button"],
-.err input[type="submit"], .err button, .err input[type="button"]
-{
-	float: right;
+#footer .lower #current_time {
+    float: right;
+    padding-right: 6px;
 }
 
-.err
-{
-	color: white;
-	display: block;
-	background-color: #e51c23 !important;
-	padding: 15px;
-	line-height: 30px;
-	min-height: 30px;
+.wrapper {
+    width: 85%;
+    min-width: 970px;
+    max-width: 1500px;
+    margin: auto;
 }
 
-.err:before
-{
-	content: "ERROR: ";
+#footer {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 60px;
+    width: 100%;
+    background: #999;
+    border-top: 1px #000 solid;
 }
 
-.warn
-{
-	color: white;
-	display: block;
-	background-color: #ff5722 !important;
-	padding: 15px;
-	line-height: 30px;
-	min-height: 30px;
+* html #footer {
+    position: absolute;
+    top: expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px');
 }
 
-.warn:before
-{
-	content: "WARNING: ";
+tr td.trow1:first-child, tr td.trow2:first-child {
+    border-left: 0;
 }
 
-.info
-{
-	color: white;
-	display: block;
-	background-color: #5677fc !important;
-	padding: 15px;
-	line-height: 30px;
-	min-height: 30px;
+tr td.trow1:last-child, tr td.trow2:last-child {
+    border-right: 0;
 }
 
-.info:before
-{
-	content: "INFORMATION: ";
+.tborder {
+    -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
+    border-radius: 7px;
 }
 
-#footer .fleft
-{
-	float: left;
+.thead {
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
 }
 
-#footer .fright
-{
-	float: right;
-	text-align: right;
+table {
+    color: #000;
+    font-size: 13px;
 }
 
-#footer
-{
-	margin: 0;
-	padding: 10px;
-	font-size: 9pt;
-	color: rgba(255, 255, 255, 0.8);
-	box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.2) inset;
+.tborder {
+    background: #fff;
+    width: 100%;
+    margin: auto;
+    border: 1px solid #ccc;
+    padding: 1px;
 }
 
-#footer a
-{
-	text-transform: none;
-	color: white;
+.thead {
+    background: #a1a2a2 url(thead.png) top left repeat-x;
+    color: #fff;
+    border-bottom: 1px solid #8e8f8f;
+    padding: 8px;
 }
 
-input[type="submit"], button, input[type="button"]
-{
-	background-color: #ffc107;
-	padding: 8px 15px 8px 15px;
-	margin: 0 2px;
-	display: inline-block;
-	text-align: center;
-	color: black;
-	box-shadow: 0px 2px 3px rgba(0,0,0,0.2);
-	border: none;
-	outline: none;
-	cursor: pointer;
+.tcat {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    color: #fff;
+    border-bottom: 1px solid #bbb;
+    padding: 6px;
+    font-size: 12px;
 }
 
-input[type="submit"]:hover, button:hover, input[type="button"]:hover
-{
-	background-color: #ffca28;
+.trow1 {
+    background: #f5f5f5;
+    border: 1px solid;
+    border-color: #fff #ddd #ddd #fff;
 }
 
-input[type="submit"]:active, button:active, input[type="button"]:active
-{
-	background-color: #ffd54f;
-	-webkit-transform: translateY(1px);
-	   -moz-transform: translateY(1px);
-			transform: translateY(1px);
+.trow2 {
+    background: #efefef;
+    border: 1px solid;
+    border-color: #fff #ddd #ddd #fff;
+    padding: 15px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
 }
 
-hr
-{
-	border: none;
-	height: 1px;
-	background-color: rgba(0, 0, 0, 0.12);
+.padtopp {
+    padding-top: 25px;
 }
 
-h4
-{
-	padding-bottom: 10px;
-	margin-bottom: 12px;
-	border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+table {
+    color: #000;
+    font-size: 13px;
+    text-align: left;
 }
 
+.tborder {
+    background: #fff;
+    width: 100%;
+    margin: auto;
+    border: 1px solid #ccc;
+    padding: 1px;
+}
 
-/**** PAGE SPECIFIC CSS ****/
+.thead {
+    background: #a1a2a2 url(thead.png) top left repeat-x;
+    color: #fff;
+    border-bottom: 1px solid #8e8f8f;
+    padding: 8px;
+}
 
-/* remove the * for disabling: */
+.tcat {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    color: #fff;
+    border-bottom: 1px solid #bbb;
+    padding: 6px;
+    font-size: 12px;
+}
 
-.page-core-server-settings table td
-{
-	text-align: center;
-	width: 25%;
+.trow1 {
+    background: #f5f5f5;
+    border: 1px solid;
+    border-color: #fff #ddd #ddd #fff;
 }
 
-.page-core-server-settings.no-param table td:nth-child(1) a,
-.page-core-server-settings.param-tab-general table td:nth-child(1) a
-{
-	font-weight: 600;
-	color: rgba(0, 0, 0, 0.87);
+.trow2 {
+    background: #efefef;
+    border: 1px solid;
+    border-color: #fff #ddd #ddd #fff;
 }
 
-.page-core-server-settings.param-tab-monsters table td:nth-child(2) a
-{
-	font-weight: 600;
-	color: rgba(0, 0, 0, 0.87);
+.smalltext {
+    font-size: 11px;
 }
 
-.page-core-server-settings.param-tab-worlds table td:nth-child(3) a
-{
-	font-weight: 600;
-	color: rgba(0, 0, 0, 0.87);
+textarea {
+    background: #fff;
+    color: #000;
+    border: 1px solid #ccc;
+    padding: 2px;
+    line-height: 1.4;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    font-size: 13px;
 }
 
-.page-core-server-settings.param-tab-world table td:nth-child(4) a
-{
-	font-weight: 600;
-	color: rgba(0, 0, 0, 0.87);
+select {
+    background: #fff;
+    padding: 3px;
+    border: 1px solid #ccc;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
 }
 
-.page-core-permissions form table tr,
-.page-core-permissions form table td,
-.page-core-permissions form table th
-{
-	border: none;
-	background-color: transparent;
+.usercp_nav_item {
+    display: block;
+    padding: 1px 0 1px 23px;
 }
 
-.page-core-permissions form table tr:nth-child(1) th
-{
-	width: 35%;
+.usercp_nav_pmfolder {
+    background: url(pmfolder.gif) no-repeat left center;
 }
 
-.page-core-permissions form table tr:nth-child(1) td
-{
-	width: 65%;
+.usercp_nav_sub_pmfolder {
+    padding-left: 40px;
+    background: url(sub_pmfolder.gif) no-repeat left center;
 }
 
-.page-core-permissions form table td input
-{
-	width: 100%;
-	box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	margin: 0;
+.usercp_nav_home {
+    background: url(home.gif) no-repeat left center;
 }
 
-#ChatDiv
-{
-	margin-bottom: 10px;
+.pagehead {
+    position: fixed;
+    z-index: 99999;
+    top: 0;
+    left: 0;
+    width: 100%;
 }
 
-#ChatMessage
-{
-	width: 100%;
-	box-sizing: border-box;
-	-moz-box-sizing: border-box;
+table {
+    width: 100%;
 }
 
-/**/
+table th {
+    border-bottom: 1px solid rgba(0,0,0,0.12);
+    padding: 5px;
+    text-align: left;
+}
+
+table tr:nth-child(odd) {
+    background-color: rgba(0,0,0,0.015);
+}
+
+p {
+    margin: 4px 0;
+    padding: 4px 3px;
+}
+
+a {
+    text-decoration: none;
+    color: #000;
+    -webkit-transition: color .1s linear;
+    -moz-transition: color .1s linear;
+    transition: color .1s linear;
+}
+
+a:hover {
+    color: #888;
+}
+
+input[type="text"] {
+    background: #fff;
+    color: #000;
+    border: 1px solid #ccc;
+    padding: 2px;
+    line-height: 1.4;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    font-size: 13px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+}
+
+input[type="text"]:hover {
+    background-color: #E5E4E2;
+}
+
+input[type="text"]:focus {
+    background-color: #E5E4E2;
+}
+
+hr {
+    border: none;
+    height: 1px;
+    background-color: rgba(0,0,0,0.12);
+}
+
+h4 {
+    padding-bottom: 10px;
+    margin-bottom: 12px;
+    border-bottom: 1px solid rgba(0,0,0,0.12);
+}
+
+#ChatDiv {
+    margin-bottom: 10px;
+}
+
+#ChatMessage {
+    width: 92%;
+    margin-right: 5px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+}
+
+input[type="submit"] {
+    padding: 3px;
+    padding-left: 5px;
+    padding-right: 5px;
+    cursor: pointer;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    background: #f5f5f5;
+    border: 1px solid #ccc;
+}
+
+input[type="submit"]:hover {
+    background-color: #E5E4E2;
+}
+
+button:disabled,input:disabled {
+    padding: 3px;
+    padding-left: 5px;
+    padding-right: 5px;
+    cursor: pointer;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    border: none!important;
+    color: #fff!important;
+    background-color: #ccc!important;
+}
diff --git a/MCServer/webadmin/files/sub_pmfolder.gif b/MCServer/webadmin/files/sub_pmfolder.gif
new file mode 100644
index 000000000..3d0d6e627
--- /dev/null
+++ b/MCServer/webadmin/files/sub_pmfolder.gif
diff --git a/MCServer/webadmin/files/tcat.png b/MCServer/webadmin/files/tcat.png
new file mode 100644
index 000000000..eb64eb3d6
--- /dev/null
+++ b/MCServer/webadmin/files/tcat.png
diff --git a/MCServer/webadmin/files/thead.png b/MCServer/webadmin/files/thead.png
new file mode 100644
index 000000000..81aa04bac
--- /dev/null
+++ b/MCServer/webadmin/files/thead.png
diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html
index 913a85db0..148f39deb 100644
--- a/MCServer/webadmin/login_template.html
+++ b/MCServer/webadmin/login_template.html
@@ -1,25 +1,70 @@
+/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
 <html>
 <head>
 	<title>MCServer WebAdmin - Login</title>
-	<meta charset="UTF-8">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link href="login.css" rel="stylesheet" type="text/css">
 	<link rel="icon" href="favicon.ico">
-	<style type="text/css">
-		header {
-			margin: 0 auto;
-			text-align: center;
-			vertical-align: middle;
-		}
-	</style>
 </head>
-
 <body>
-	<header>
-		<img src="mc-logo.png" alt="MCServer Logo" class="logo">
-		<h1>MCServer - WebAdmin</h1>
-		<form method="get" action="webadmin/">
-			<input type="submit" value="Log in">
-		</form>
-	</header>
+<div class="contention">
+	<div class="row1">
+		<div class="wrapper">
+			<img src="logo_login.png" alt="MCServer Logo" class="logo">
+		</div>
+	</div>
+	<div id="panel">
+		<div class="upper">
+			<div class="wrapper">
+				<div>
+					<form method="get" action="webadmin/" />
+						<button type="submit" value="Log in" style="width:150px;height:25px;font-family:'Source Sans Pro',sans-serif;background:transparent;border:none!important;vertical-align:middle">
+							<strong><img src="login.gif" style="vertical-align:bottom" /> WebAdmin Log in</strong>
+						</button>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="row2 push10">
+		<div class="wrapper padtopp">
+			<table border="0" cellspacing="0" cellpadding="5" class="tborder" style="margin-bottom:5px">
+				<tbody>
+					<tr>
+						<td class="thead rounded_top">
+							<div style="float:left!important"><strong>MCServer WebAdmin</strong></div>
+						</td>
+					</tr>
+					<tr>
+						<td class="trow2 post_content">
+							<div class="post_body">
+								<iframe width="100%" height="100%" style="border:none;min-height:350px;max-height:450px" src="/guest.html"></iframe>
+							</div>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+<div id="footer">
+	<div class="upper">
+		<div class="wrapper">
+			<ul class="menu bottom_links">
+				<li><a href="http://www.mc-server.org" target="_blank">MCServer</a></li>
+				<li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li>
+				<li><a href="http://builds.cuberite.org" target="_blank">Buildserver</a></li>
+				<li><a href="http://mc-server.xoft.cz/LuaAPI" target="_blank">API Documentation</a></li>
+				<li><a href="http://book.mc-server.org/" target="_blank">User's Manual</a></li>
+			</ul>
+		</div>
+	</div>
+	<div class="lower">
+		<div class="wrapper">
+			<span id="current_time"><strong>Current time:</strong> <script type="text/javascript">document.write('Time: <strong><span id="date-time">',new Date().toLocaleString(),"</span></strong>");if(document.getElementById){onload=function(){setInterval("document.getElementById ('date-time').firstChild.data = new Date().toLocaleString()",50)}};</script></span>
+			<span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
+		</div>
+	</div>
+</div>
 </body>
-
 </html>
diff --git a/MCServer/webadmin/temp.html b/MCServer/webadmin/temp.html
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/MCServer/webadmin/temp.html
@@ -0,0 +1 @@
+
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index 05ca224b1..2811d16f8 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -81,22 +81,56 @@ function ShowPage(WebAdmin, TemplateRequest)
 	end
 	
 	Output([[
-<!DOCTYPE html>
+/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="icon" href="/favicon.ico">
-<title>]] .. Title .. [[</title>
-<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600,300' rel='stylesheet' type='text/css'>
-<link rel="stylesheet" type="text/css" href="/style.css">
+	<title>]] .. Title .. [[</title>
+	<meta charset="UTF-8">
+	<link rel="stylesheet" type="text/css" href="/style.css">
+	<link rel="icon" href="/favicon.ico">
 </head>
 <body>
-<div id="wrapper">
-	<div id="containerHolder">
-		<a href="./" class="title light">MCServer</a>
-		<div id="container">
-			<div id="sidebar">
-				<ul class="sideNav">
-					<li class='link'><a href=']] .. BaseURL .. [['>Home</a></li>
+<div class="contention">
+	<div class="pagehead">
+		<div class="row1">
+			<div class="wrapper">
+				<img src="/logo_login.png" alt="MCServer Logo" class="logo">
+			</div>
+		</div>
+		<div id="panel">
+			<div class="upper">
+				<div class="wrapper">
+					<ul class="menu top_links">
+						<li><a>Server Name: <strong>]] .. cRoot:Get():GetServer():GetServerID() .. [[</strong></a></li>
+						<li><a>Memory: <strong>]] .. MemoryUsageKiB / 1024 .. [[MB</strong></a></li>
+						<li><a>Chunks: <strong>]] .. NumChunks .. [[</strong></a></li>
+					</ul>
+					<div class="welcome"><strong>Welcome back, ]] .. TemplateRequest.Request.Username .. [[</strong>&nbsp;&nbsp;&nbsp;<a href=".././"><img src="/log_out.png" style="vertical-align:bottom;"> Log Out</a></div>
+				</div>
+			</div>
+		</div>
+	</div>
+<div class="row2 push10">
+	<div class="wrapper padtopp">
+		<table width="100%" border="0" align="center">
+			<tbody>
+				<tr>
+					<td width="180" valign="top">
+						<table border="0" cellspacing="0" cellpadding="5" class="tborder">
+						<tbody>
+							<tr>
+								<td class="thead"><strong>Menu</strong></td>
+							</tr>
+							<tr>
+								<td class="trow1 smalltext"><a href=']] .. BaseURL .. [[' class='usercp_nav_item usercp_nav_home'>Home</a></td>
+							</tr>
+							<tr>
+								<td class="tcat"><div><span class="smalltext"><strong><font color="#000">Server Management</font></strong></span></div></td>
+							</tr>
+						</tbody>
+						<tbody style="" id="usercppms_e">
+							<tr>
+								<td class="trow1 smalltext">
 	]])
 
 
@@ -105,30 +139,59 @@ function ShowPage(WebAdmin, TemplateRequest)
 		local PluginWebTitle = value:GetWebTitle()
 		local TabNames = value:GetTabNames()
 		if (GetTableSize(TabNames) > 0) then
-			Output("<li>"..PluginWebTitle.."</li>\n");
+			Output("<div><a class='usercp_nav_item usercp_nav_pmfolder' style='text-decoration:none;'><b>"..PluginWebTitle.."</b></a></div>\n");
 			
 			for webname,prettyname in pairs(TabNames) do
-				Output("<li class='link'><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "'>" .. prettyname .. "</a></li>\n")
+				Output("<div><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "' class='usercp_nav_item usercp_nav_sub_pmfolder'>" .. prettyname .. "</a></div>\n")
 			end
+
+			Output("<br>\n");
 		end
 	end
 
 	
 	Output([[
-					</ul>
-			</div>
-			
-			<div id="main" class="page-]] .. string.lower(PluginPage.PluginName .. "-" .. string.gsub(PluginPage.TabName, "[^a-zA-Z0-9]+", "-")) .. reqParamsClass .. [[">
-				<h2 class="welcome-msg">Welcome <span class="username">]] .. TemplateRequest.Request.Username .. [[</span></h2>
-				
-				<hr/>
-				
-				<h3>]] .. SubTitle .. [[</h3>
-					]] .. PageContent .. [[</div>
-			<div class="clear"></div>
+								</td>
+							</tr>
+						</tbody>
+						</table>
+					</td>
+					<td valign="top" style='padding-left:25px;'>
+						<table border="0" cellspacing="0" cellpadding="5" class="tborder">
+						<tbody>
+							<tr>
+								<td class="thead" colspan="2"><strong>]] .. SubTitle .. [[</strong></td>
+							</tr>
+							<tr>
+								<td class="trow2">]] .. PageContent .. [[</td>
+							</tr>
+						</tbody>
+						</table>
+					</td>
+				</tr>
+			</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+<div id="footer">
+	<div class="upper">
+		<div class="wrapper">
+			<ul class="menu bottom_links">
+				<li><a href="http://www.mc-server.org" target="_blank">MCServer</a></li>
+				<li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li>
+				<li><a href="http://builds.cuberite.org" target="_blank">Buildserver</a></li>
+				<li><a href="http://mc-server.xoft.cz/LuaAPI" target="_blank">API Documentation</a></li>
+				<li><a href="http://book.mc-server.org/" target="_blank">User's Manual</a></li>
+			</ul>
+		</div>
+	</div>
+	<div class="lower">
+		<div class="wrapper">
+			<span id="current_time"><strong>Current time:</strong> <script type="text/javascript">document.write('Time: <strong><span id="date-time">',new Date().toLocaleString(),"</span></strong>");if(document.getElementById){onload=function(){setInterval("document.getElementById ('date-time').firstChild.data = new Date().toLocaleString()",50)}};</script></span>
+			<span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
 		</div>
 	</div>
-	<div id="footer"><div class="fleft">running MCServer using <span class="bold">]] .. MemoryUsageKiB / 1024 .. [[MB</span> of memory; <span class="bold">]] .. NumChunks .. [[</span> chunks</div><div class="fright">design by <a href="//www.github.com/WebFreak001">WebFreak001</a></div><div class="clear"></div></div>
 </div>
 </body>
 </html>
diff --git a/README.md b/README.md
index 9e9751b35..bcc7c118f 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,8 @@ We currently support Release 1.7 and 1.8 (not beta) Minecraft protocol versions.
 Installation
 ------------
 
+[![Install on DigitalOcean](http://doinstall.bearbin.net/button.svg)](http://doinstall.bearbin.net/install?url=https://github.com/mc-server/MCServer)
+
 For Linux there is an easy installation method, just run this in your terminal:
 
     curl -s https://raw.githubusercontent.com/mc-server/MCServer/master/easyinstall.sh | sh
diff --git a/Tools/QtBiomeVisualiser/BiomeView.cpp b/Tools/QtBiomeVisualiser/BiomeView.cpp
index b44b935d7..c77b39482 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.cpp
+++ b/Tools/QtBiomeVisualiser/BiomeView.cpp
@@ -1,8 +1,8 @@
 #include "Globals.h"
 #include "BiomeView.h"
-#include "QtChunk.h"
 #include <QPainter>
 #include <QResizeEvent>
+#include "Region.h"
 
 
 
@@ -14,6 +14,116 @@ static const int DELTA_STEP = 120;  // The normal per-notch wheel delta
 
 
 
+/** Map for converting biome values to colors. Initialized from biomeColors[]. */
+static uchar biomeToColor[256 * 4];
+
+/** Map for converting biome values to colors. Used to initialize biomeToColor[].*/
+static struct
+{
+	EMCSBiome m_Biome;
+	uchar m_Color[3];
+} biomeColors[] =
+{
+	{ biOcean,                { 0x00, 0x00, 0x70 }, },
+	{ biPlains,               { 0x8d, 0xb3, 0x60 }, },
+	{ biDesert,               { 0xfa, 0x94, 0x18 }, },
+	{ biExtremeHills,         { 0x60, 0x60, 0x60 }, },
+	{ biForest,               { 0x05, 0x66, 0x21 }, },
+	{ biTaiga,                { 0x0b, 0x66, 0x59 }, },
+	{ biSwampland,            { 0x2f, 0xff, 0xda }, },
+	{ biRiver,                { 0x30, 0x30, 0xaf }, },
+	{ biHell,                 { 0x7f, 0x00, 0x00 }, },
+	{ biSky,                  { 0x00, 0x7f, 0xff }, },
+	{ biFrozenOcean,          { 0xa0, 0xa0, 0xdf }, },
+	{ biFrozenRiver,          { 0xa0, 0xa0, 0xff }, },
+	{ biIcePlains,            { 0xff, 0xff, 0xff }, },
+	{ biIceMountains,         { 0xa0, 0xa0, 0xa0 }, },
+	{ biMushroomIsland,       { 0xff, 0x00, 0xff }, },
+	{ biMushroomShore,        { 0xa0, 0x00, 0xff }, },
+	{ biBeach,                { 0xfa, 0xde, 0x55 }, },
+	{ biDesertHills,          { 0xd2, 0x5f, 0x12 }, },
+	{ biForestHills,          { 0x22, 0x55, 0x1c }, },
+	{ biTaigaHills,           { 0x16, 0x39, 0x33 }, },
+	{ biExtremeHillsEdge,     { 0x7f, 0x8f, 0x7f }, },
+	{ biJungle,               { 0x53, 0x7b, 0x09 }, },
+	{ biJungleHills,          { 0x2c, 0x42, 0x05 }, },
+
+	{ biJungleEdge,           { 0x62, 0x8b, 0x17 }, },
+	{ biDeepOcean,            { 0x00, 0x00, 0x30 },	},
+	{ biStoneBeach,           { 0xa2, 0xa2, 0x84 },	},
+	{ biColdBeach,            { 0xfa, 0xf0, 0xc0 },	},
+	{ biBirchForest,          { 0x30, 0x74, 0x44 },	},
+	{ biBirchForestHills,     { 0x1f, 0x5f, 0x32 },	},
+	{ biRoofedForest,         { 0x40, 0x51, 0x1a },	},
+	{ biColdTaiga,            { 0x31, 0x55, 0x4a },	},
+	{ biColdTaigaHills,       { 0x59, 0x7d, 0x72 },	},
+	{ biMegaTaiga,            { 0x59, 0x66, 0x51 },	},
+	{ biMegaTaigaHills,       { 0x59, 0x66, 0x59 },	},
+	{ biExtremeHillsPlus,     { 0x50, 0x70, 0x50 },	},
+	{ biSavanna,              { 0xbd, 0xb2, 0x5f },	},
+	{ biSavannaPlateau,       { 0xa7, 0x9d, 0x64 },	},
+	{ biMesa,                 { 0xd9, 0x45, 0x15 },	},
+	{ biMesaPlateauF,         { 0xb0, 0x97, 0x65 },	},
+	{ biMesaPlateau,          { 0xca, 0x8c, 0x65 },	},
+
+	// M variants:
+	{ biSunflowerPlains,      { 0xb5, 0xdb, 0x88 }, },
+	{ biDesertM,              { 0xff, 0xbc, 0x40 }, },
+	{ biExtremeHillsM,        { 0x88, 0x88, 0x88 }, },
+	{ biFlowerForest,         { 0x2d, 0x8e, 0x49 }, },
+	{ biTaigaM,               { 0x33, 0x8e, 0x81 }, },
+	{ biSwamplandM,           { 0x07, 0xf9, 0xb2 }, },
+	{ biIcePlainsSpikes,      { 0xb4, 0xdc, 0xdc }, },
+	{ biJungleM,              { 0x7b, 0xa3, 0x31 }, },
+	{ biJungleEdgeM,          { 0x62, 0x8b, 0x17 }, },
+	{ biBirchForestM,         { 0x58, 0x9c, 0x6c }, },
+	{ biBirchForestHillsM,    { 0x47, 0x87, 0x5a }, },
+	{ biRoofedForestM,        { 0x68, 0x79, 0x42 }, },
+	{ biColdTaigaM,           { 0x24, 0x3f, 0x36 }, },
+	{ biMegaSpruceTaiga,      { 0x45, 0x4f, 0x3e }, },
+	{ biMegaSpruceTaigaHills, { 0x45, 0x4f, 0x4e }, },
+	{ biExtremeHillsPlusM,    { 0x78, 0x98, 0x78 }, },
+	{ biSavannaM,             { 0xe5, 0xda, 0x87 }, },
+	{ biSavannaPlateauM,      { 0xa7, 0x9d, 0x74 }, },
+	{ biMesaBryce,            { 0xff, 0x6d, 0x3d }, },
+	{ biMesaPlateauFM,        { 0xd8, 0xbf, 0x8d }, },
+	{ biMesaPlateauM,         { 0xf2, 0xb4, 0x8d }, },
+} ;
+
+
+
+
+
+static class BiomeColorsInitializer
+{
+public:
+	BiomeColorsInitializer(void)
+	{
+		// Reset all colors to gray:
+		for (size_t i = 0; i < ARRAYCOUNT(biomeToColor); i++)
+		{
+			biomeToColor[i] = 0x7f;
+		}
+
+		// Set known biomes to their colors:
+		for (size_t i = 0; i < ARRAYCOUNT(biomeColors); i++)
+		{
+			uchar * color = &biomeToColor[4 * biomeColors[i].m_Biome];
+			color[0] = biomeColors[i].m_Color[2];
+			color[1] = biomeColors[i].m_Color[1];
+			color[2] = biomeColors[i].m_Color[0];
+			color[3] = 0xff;
+		}
+	}
+} biomeColorInitializer;
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// BiomeView:
+
 BiomeView::BiomeView(QWidget * parent) :
 	super(parent),
 	m_X(0),
@@ -40,7 +150,7 @@ BiomeView::BiomeView(QWidget * parent) :
 	redraw();
 
 	// Add a chunk-update callback mechanism:
-	connect(&m_Cache, SIGNAL(chunkAvailable(int, int)), this, SLOT(chunkAvailable(int, int)));
+	connect(&m_Cache, SIGNAL(regionAvailable(int, int)), this, SLOT(regionAvailable(int, int)));
 
 	// Allow mouse and keyboard interaction:
 	setFocusPolicy(Qt::StrongFocus);
@@ -143,9 +253,15 @@ void BiomeView::redraw()
 
 
 
-void BiomeView::chunkAvailable(int a_ChunkX, int a_ChunkZ)
+void BiomeView::regionAvailable(int a_RegionX, int a_RegionZ)
 {
-	drawChunk(a_ChunkX, a_ChunkZ);
+	for (int z = 0; z < 32; z++)
+	{
+		for (int x = 0; x < 32; x++)
+		{
+			drawChunk(a_RegionX * 32 + x, a_RegionZ * 32 + z);
+		}
+	}
 	update();
 }
 
@@ -175,8 +291,11 @@ void BiomeView::drawChunk(int a_ChunkX, int a_ChunkZ)
 		return;
 	}
 
-	//fetch the chunk:
-	ChunkPtr chunk = m_Cache.fetch(a_ChunkX, a_ChunkZ);
+	// Fetch the region:
+	int regionX;
+	int regionZ;
+	Region::chunkToRegion(a_ChunkX, a_ChunkZ, regionX, regionZ);
+	RegionPtr region = m_Cache.fetch(regionX, regionZ);
 
 	// Figure out where on the screen this chunk should be drawn:
 	// first find the center chunk
@@ -194,11 +313,10 @@ void BiomeView::drawChunk(int a_ChunkX, int a_ChunkZ)
 	centerx += (a_ChunkX - centerchunkx) * chunksize;
 	centery += (a_ChunkZ - centerchunkz) * chunksize;
 
-	int srcoffset = 0;
 	uchar * bits = m_Image.bits();
 	int imgstride = m_Image.bytesPerLine();
 
-	int skipx = 0,skipy = 0;
+	int skipx = 0, skipy = 0;
 	int blockwidth = chunksize, blockheight = chunksize;
 	// now if we're off the screen we need to crop
 	if (centerx < 0)
@@ -227,29 +345,52 @@ void BiomeView::drawChunk(int a_ChunkX, int a_ChunkZ)
 	int imgoffset = centerx * 4 + centery * imgstride;
 
 	// If the chunk is valid, use its data; otherwise use the empty placeholder:
-	const uchar * src = m_EmptyChunkImage;
-	if (chunk.get() != nullptr)
+	const short * src = m_EmptyChunkBiomes;
+	if (region.get() != nullptr)
 	{
-		src = chunk->getImage();
+		int relChunkX = a_ChunkX - regionX * 32;
+		int relChunkZ = a_ChunkZ - regionZ * 32;
+		Chunk & chunk = region->getRelChunk(relChunkX, relChunkZ);
+		if (chunk.isValid())
+		{
+			src = chunk.getBiomes();
+		}
 	}
 
-	// Blit or scale-blit the image:
+	// Scale-blit the image:
 	for (int z = skipy; z < blockheight; z++, imgoffset += imgstride)
 	{
-		srcoffset = floor((double)z / m_Zoom) * 16 * 4;
-		if (m_Zoom == 1.0)
-		{
-			memcpy(bits + imgoffset, src + srcoffset + skipx * 4, (blockwidth - skipx) * 4);
-		}
-		else
+		size_t srcoffset = static_cast<size_t>(std::floor((double)z / m_Zoom)) * 16;
+		int imgxoffset = imgoffset;
+		for (int x = skipx; x < blockwidth; x++)
 		{
-			int xofs = 0;
-			for (int x = skipx; x < blockwidth; x++, xofs +=4)
+			short biome = src[srcoffset + static_cast<size_t>(std::floor((double)x / m_Zoom))];
+			const uchar * color;
+			if (biome < 0)
 			{
-				memcpy(bits + imgoffset + xofs, src + srcoffset + (int)floor((double)x / m_Zoom) * 4, 4);
+				static const uchar emptyBiome1[] = { 0x44, 0x44, 0x44, 0xff };
+				static const uchar emptyBiome2[] = { 0x88, 0x88, 0x88, 0xff };
+				color = ((x & 8) ^ (z & 8)) ? emptyBiome1 : emptyBiome2;
 			}
-		}
-	}
+			else
+			{
+				if (biome * 4 >= ARRAYCOUNT(biomeToColor))
+				{
+					static const uchar errorImage[] = { 0xff, 0x00, 0x00, 0xff };
+					color = errorImage;
+				}
+				else
+				{
+					color = biomeToColor + biome * 4;
+				}
+			}
+			bits[imgxoffset]     = color[0];
+			bits[imgxoffset + 1] = color[1];
+			bits[imgxoffset + 2] = color[2];
+			bits[imgxoffset + 3] = color[3];
+			imgxoffset += 4;
+		}  // for x
+	}  // for z
 }
 
 
@@ -317,11 +458,12 @@ void BiomeView::mouseMoveEvent(QMouseEvent * a_Event)
 	// Update the status bar info text:
 	int blockX = floor((a_Event->x() - width()  / 2) / m_Zoom + m_X);
 	int blockZ = floor((a_Event->y() - height() / 2) / m_Zoom + m_Z);
-	int chunkX, chunkZ;
-	int relX = blockX, relY, relZ = blockZ;
-	cChunkDef::AbsoluteToRelative(relX, relY, relZ, chunkX, chunkZ);
-	auto chunk = m_Cache.fetch(chunkX, chunkZ);
-	int biome = (chunk.get() != nullptr) ? chunk->getBiome(relX, relZ) : biInvalidBiome;
+	int regionX, regionZ;
+	Region::blockToRegion(blockX, blockZ, regionX, regionZ);
+	int relX = blockX - regionX * 512;
+	int relZ = blockZ - regionZ * 512;
+	auto region = m_Cache.fetch(regionX, regionZ);
+	int biome = (region.get() != nullptr) ? region->getRelBiome(relX, relZ) : biInvalidBiome;
 	emit hoverChanged(blockX, blockZ, biome);
 }
 
diff --git a/Tools/QtBiomeVisualiser/BiomeView.h b/Tools/QtBiomeVisualiser/BiomeView.h
index 40d8b96ae..cd9c7ead9 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.h
+++ b/Tools/QtBiomeVisualiser/BiomeView.h
@@ -2,7 +2,7 @@
 
 #include <QWidget>
 #include <memory>
-#include "ChunkCache.h"
+#include "RegionCache.h"
 #include "ChunkSource.h"
 
 
@@ -51,8 +51,8 @@ public slots:
 	/** Redraw the entire widget area. */
 	void redraw();
 
-	/** A specified chunk has become available, redraw it. */
-	void chunkAvailable(int a_ChunkX, int a_ChunkZ);
+	/** A specified region has become available, redraw it. */
+	void regionAvailable(int a_RegionX, int a_RegionZ);
 
 	/** Reloads the current chunk source and redraws the entire workspace. */
 	void reload();
@@ -62,7 +62,7 @@ protected:
 	double m_Zoom;
 
 	/** Cache for the loaded chunk data. */
-	ChunkCache m_Cache;
+	RegionCache m_Cache;
 
 	/** The entire view's contents in an offscreen image. */
 	QImage m_Image;
@@ -79,6 +79,9 @@ protected:
 	/** Data used for rendering a chunk that hasn't been loaded yet */
 	uchar m_EmptyChunkImage[16 * 16 * 4];
 
+	/** Data placeholder for chunks that aren't valid. */
+	short m_EmptyChunkBiomes[16 * 16];
+
 
 	/** Draws the specified chunk into m_Image */
 	void drawChunk(int a_ChunkX, int a_ChunkZ);
diff --git a/Tools/QtBiomeVisualiser/ChunkCache.cpp b/Tools/QtBiomeVisualiser/ChunkCache.cpp
deleted file mode 100644
index 05c267d30..000000000
--- a/Tools/QtBiomeVisualiser/ChunkCache.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "Globals.h"
-#include "ChunkCache.h"
-#include <QMutexLocker>
-#include <QThreadPool>
-#include "ChunkSource.h"
-#include "ChunkLoader.h"
-
-
-
-
-
-ChunkCache::ChunkCache(QObject * parent) :
-	super(parent)
-{
-	m_Cache.setMaxCost(1024 * 1024 * 1024);  // 1 GiB of memory for the cache
-}
-
-
-
-
-
-ChunkPtr ChunkCache::fetch(int a_ChunkX, int a_ChunkZ)
-{
-	// Retrieve from the cache:
-	quint32 hash = getChunkHash(a_ChunkX, a_ChunkZ);
-	ChunkPtr * res;
-	{
-		QMutexLocker lock(&m_Mtx);
-		res = m_Cache[hash];
-		// If succesful and chunk loaded, return the retrieved value:
-		if ((res != nullptr) && (*res)->isValid())
-		{
-			return *res;
-		}
-	}
-
-	// If the chunk is in cache but not valid, it means it has been already queued for rendering, do nothing now:
-	if (res != nullptr)
-	{
-		return ChunkPtr(nullptr);
-	}
-
-	// There's no such item in the cache, create it now:
-	res = new ChunkPtr(new Chunk);
-	if (res == nullptr)
-	{
-		return ChunkPtr(nullptr);
-	}
-	{
-		QMutexLocker lock(&m_Mtx);
-		m_Cache.insert(hash, res, sizeof(Chunk));
-	}
-
-	// Queue the chunk for rendering:
-	queueChunkRender(a_ChunkX, a_ChunkZ, *res);
-
-	// Return failure, the chunk is not yet rendered:
-	return ChunkPtr(nullptr);
-}
-
-
-
-
-
-void ChunkCache::setChunkSource(std::shared_ptr<ChunkSource> a_ChunkSource)
-{
-	// Replace the chunk source:
-	m_ChunkSource = a_ChunkSource;
-
-	// Clear the cache:
-	QMutexLocker lock(&m_Mtx);
-	m_Cache.clear();
-}
-
-
-
-
-
-void ChunkCache::reload()
-{
-	assert(m_ChunkSource.get() != nullptr);
-
-	// Reload the chunk source:
-	m_ChunkSource->reload();
-
-	// Clear the cache:
-	QMutexLocker lock(&m_Mtx);
-	m_Cache.clear();
-}
-
-
-
-
-
-void ChunkCache::gotChunk(int a_ChunkX, int a_ChunkZ)
-{
-	emit chunkAvailable(a_ChunkX, a_ChunkZ);
-}
-
-
-
-
-
-quint32 ChunkCache::getChunkHash(int a_ChunkX, int a_ChunkZ)
-{
-	// Simply join the two coords into a single int
-	// The coords will never be larger than 16-bits, so we can do this safely
-	return (((static_cast<quint32>(a_ChunkX) & 0xffff) << 16) | (static_cast<quint32>(a_ChunkZ) & 0xffff));
-}
-
-
-
-
-
-void ChunkCache::queueChunkRender(int a_ChunkX, int a_ChunkZ, ChunkPtr & a_Chunk)
-{
-	// Create a new loader task:
-	ChunkLoader * loader = new ChunkLoader(a_ChunkX, a_ChunkZ, a_Chunk, m_ChunkSource);
-	connect(loader, SIGNAL(loaded(int, int)), this, SLOT(gotChunk(int, int)));
-
-	QThreadPool::globalInstance()->start(loader);
-}
-
-
-
-
diff --git a/Tools/QtBiomeVisualiser/ChunkLoader.cpp b/Tools/QtBiomeVisualiser/ChunkLoader.cpp
deleted file mode 100644
index 3d0123b23..000000000
--- a/Tools/QtBiomeVisualiser/ChunkLoader.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "Globals.h"
-#include "ChunkLoader.h"
-#include "ChunkSource.h"
-
-
-
-
-
-ChunkLoader::ChunkLoader(int a_ChunkX, int a_ChunkZ, ChunkPtr a_Chunk, ChunkSourcePtr a_ChunkSource) :
-	m_ChunkX(a_ChunkX),
-	m_ChunkZ(a_ChunkZ),
-	m_Chunk(a_Chunk),
-	m_ChunkSource(a_ChunkSource)
-{
-}
-
-
-
-
-
-void ChunkLoader::run()
-{
-	m_ChunkSource->getChunkBiomes(m_ChunkX, m_ChunkZ, m_Chunk);
-	emit loaded(m_ChunkX, m_ChunkZ);
-}
-
-
-
-
diff --git a/Tools/QtBiomeVisualiser/ChunkLoader.h b/Tools/QtBiomeVisualiser/ChunkLoader.h
deleted file mode 100644
index 4d026a45e..000000000
--- a/Tools/QtBiomeVisualiser/ChunkLoader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QRunnable>
-#include <memory>
-
-
-
-
-// fwd:
-class Chunk;
-typedef std::shared_ptr<Chunk> ChunkPtr;
-
-class ChunkSource;
-typedef std::shared_ptr<ChunkSource> ChunkSourcePtr;
-
-
-
-
-
-class ChunkLoader :
-	public QObject,
-	public QRunnable
-{
-	Q_OBJECT
-
-public:
-	ChunkLoader(int a_ChunkX, int a_ChunkZ, ChunkPtr a_Chunk, ChunkSourcePtr a_ChunkSource);
-	virtual ~ChunkLoader() {}
-
-signals:
-	void loaded(int a_ChunkX, int a_ChunkZ);
-
-protected:
-	virtual void run() override;
-
-private:
-	int m_ChunkX, m_ChunkZ;
-	ChunkPtr m_Chunk;
-	ChunkSourcePtr m_ChunkSource;
-};
-
-
-
-
diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp
index c5cde1c3b..ea3346f04 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp
@@ -24,26 +24,69 @@ BioGenSource::BioGenSource(cIniFilePtr a_IniFile) :
 
 
 
-void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk)
+void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, Chunk & a_DestChunk)
 {
 	cChunkDef::BiomeMap biomes;
+	int tag;
+	cBiomeGenPtr biomeGen = getBiomeGen(tag);
+	biomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
+	releaseBiomeGen(std::move(biomeGen), tag);
+	a_DestChunk.setBiomes(biomes);
+}
+
+
+
+
+
+void BioGenSource::reload()
+{
+	QMutexLocker lock(&m_Mtx);
+	m_CurrentTag += 1;
+	m_BiomeGens.clear();
+}
+
+
+
+
+
+cBiomeGenPtr BioGenSource::getBiomeGen(int & a_Tag)
+{
+	QMutexLocker lock(&m_Mtx);
+	a_Tag = m_CurrentTag;
+	if (m_BiomeGens.empty())
+	{
+		// Create a new biogen:
+		lock.unlock();
+		int seed = m_IniFile->GetValueSetI("Seed", "Seed", 0);
+		bool unused;
+		cBiomeGenPtr res = cBiomeGen::CreateBiomeGen(*m_IniFile, seed, unused);
+		return res;
+	}
+	else
 	{
-		QMutexLocker lock(&m_Mtx);
-		m_BiomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
+		// Return an existing biogen:
+		cBiomeGenPtr res = m_BiomeGens.back();
+		m_BiomeGens.pop_back();
+		return res;
 	}
-	a_DestChunk->setBiomes(biomes);
 }
 
 
 
 
 
-void BioGenSource::reload()
+void BioGenSource::releaseBiomeGen(cBiomeGenPtr && a_BiomeGen, int a_Tag)
 {
-	int seed = m_IniFile->GetValueSetI("Seed", "Seed", 0);
-	bool unused = false;
 	QMutexLocker lock(&m_Mtx);
-	m_BiomeGen = cBiomeGen::CreateBiomeGen(*m_IniFile, seed, unused);
+
+	// If the tag differs, the source has been reloaded and this biogen is old, dispose:
+	if (a_Tag != m_CurrentTag)
+	{
+		return;
+	}
+
+	// The tag is the same, put the biogen back to list:
+	m_BiomeGens.push_back(std::move(a_BiomeGen));
 }
 
 
@@ -160,7 +203,7 @@ AnvilSource::AnvilSource(QString a_WorldRegionFolder) :
 
 
 
-void AnvilSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk)
+void AnvilSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, Chunk & a_DestChunk)
 {
 	// Load the compressed data:
 	AString compressedChunkData = getCompressedChunkData(a_ChunkX, a_ChunkZ);
@@ -200,7 +243,7 @@ void AnvilSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChun
 		{
 			biomeMap[i] = (EMCSBiome)GetBEInt(beBiomes + 4 * i);
 		}
-		a_DestChunk->setBiomes(biomeMap);
+		a_DestChunk.setBiomes(biomeMap);
 		return;
 	}
 
@@ -216,7 +259,7 @@ void AnvilSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChun
 	{
 		biomeMap[i] = EMCSBiome(vanillaBiomes[i]);
 	}
-	a_DestChunk->setBiomes(biomeMap);
+	a_DestChunk.setBiomes(biomeMap);
 }
 
 
@@ -260,7 +303,7 @@ AnvilSource::AnvilFilePtr AnvilSource::getAnvilFile(int a_ChunkX, int a_ChunkZ)
 
 	// Search the cache for the file:
 	QMutexLocker lock(&m_Mtx);
-	for (auto itr = m_Files.cbegin(), end = m_Files.cend(); itr != end; ++itr)
+	for (auto itr = m_Files.begin(), end = m_Files.end(); itr != end; ++itr)
 	{
 		if (((*itr)->m_RegionX == RegionX) && ((*itr)->m_RegionZ == RegionZ))
 		{
diff --git a/Tools/QtBiomeVisualiser/ChunkSource.h b/Tools/QtBiomeVisualiser/ChunkSource.h
index 5332c5d3f..62f9b5626 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.h
+++ b/Tools/QtBiomeVisualiser/ChunkSource.h
@@ -10,7 +10,7 @@
 
 // fwd:
 class cBiomeGen;
-typedef std::shared_ptr<cBiomeGen> cBiomeGenPtr;
+typedef SharedPtr<cBiomeGen> cBiomeGenPtr;
 class cIniFile;
 typedef std::shared_ptr<cIniFile> cIniFilePtr;
 
@@ -26,7 +26,7 @@ public:
 
 	/** Fills the a_DestChunk with the biomes for the specified coords.
 	It is expected to be thread-safe and re-entrant. Usually QThread::idealThreadCount() threads are used. */
-	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk) = 0;
+	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, Chunk & a_DestChunk) = 0;
 
 	/** Forces a fresh reload of the source. Useful mainly for the generator, whose underlying definition file may have been changed. */
 	virtual void reload() = 0;
@@ -45,7 +45,7 @@ public:
 	BioGenSource(cIniFilePtr a_IniFile);
 
 	// ChunkSource overrides:
-	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk) override;
+	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, Chunk & a_DestChunk) override;
 	virtual void reload(void) override;
 
 protected:
@@ -53,10 +53,30 @@ protected:
 	cIniFilePtr m_IniFile;
 
 	/** The generator used for generating biomes. */
-	cBiomeGenPtr m_BiomeGen;
+	std::vector<cBiomeGenPtr> m_BiomeGens;
 
-	/** Guards m_BiomeGen against multithreaded access. */
+	/** Guards m_BiomeGens against multithreaded access. */
 	QMutex m_Mtx;
+
+	/** Keeps track of the current settings of the biomegens.
+	Incremented by one each time reload() is called. Provides the means of releasing old biomegens that were
+	in use while reload() was being processed and thus couldn't be changed back then. releaseBiomeGen() does
+	the job of filtering the biogens before reusing them. */
+	int m_CurrentTag;
+
+
+	/** Retrieves one cBiomeGenPtr from m_BiomeGens.
+	If there's no biogen available there, creates a new one based on the ini file.
+	When done with it, the caller should call releaseBiomeGen() to put the biogen back to m_BiomeGens.
+	a_Tag receives the value of m_CurrentTag from when the lock was held; it should be passed to
+	releaseBiomeGen() together with the biogen. */
+	cBiomeGenPtr getBiomeGen(int & a_Tag);
+
+	/** Marks the specified biogen as available for reuse (puts it back into m_BiomeGens).
+	a_Tag is the value of m_CurrentTag from the time when the biogen was retrieved; if it is different from
+	current m_CurrentTagValue, the biogen will be disposed of (because reload() has been called in the
+	meantime). */
+	void releaseBiomeGen(cBiomeGenPtr && a_BiomeGen, int a_Tag);
 };
 
 
@@ -70,7 +90,7 @@ public:
 	AnvilSource(QString a_WorldRegionFolder);
 
 	// ChunkSource overrides:
-	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk) override;
+	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, Chunk & a_DestChunk) override;
 	virtual void reload() override;
 
 protected:
diff --git a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
index a6490d9fe..8f97e1f37 100644
--- a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
+++ b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp
@@ -14,6 +14,8 @@ static const QString s_GeneratorNames[] =
 	QString("Checkerboard"),
 	QString("Constant"),
 	QString("DistortedVoronoi"),
+	QString("Grown"),
+	QString("GrownProt"),
 	QString("MultiStepMap"),
 	QString("TwoLevel"),
 	QString("Voronoi"),
diff --git a/Tools/QtBiomeVisualiser/MainWindow.cpp b/Tools/QtBiomeVisualiser/MainWindow.cpp
index 7853d768e..c6ea8656e 100644
--- a/Tools/QtBiomeVisualiser/MainWindow.cpp
+++ b/Tools/QtBiomeVisualiser/MainWindow.cpp
@@ -8,12 +8,13 @@
 #include <QSettings>
 #include <QDirIterator>
 #include <QStatusBar>
-#include "src/IniFile.h"
 #include "ChunkSource.h"
+#include "src/IniFile.h"
 #include "src/Generating/BioGen.h"
 #include "src/StringCompression.h"
 #include "src/WorldStorage/FastNBT.h"
 #include "GeneratorSetup.h"
+#include "RegionLoader.h"
 
 
 
@@ -31,7 +32,8 @@ const double MainWindow::m_ViewZooms[] =
 MainWindow::MainWindow(QWidget * parent) :
 	QMainWindow(parent),
 	m_GeneratorSetup(nullptr),
-	m_LineSeparator(nullptr)
+	m_LineSeparator(nullptr),
+	m_CurrentZoomLevel(2)
 {
 	initMinecraftPath();
 
@@ -40,6 +42,7 @@ MainWindow::MainWindow(QWidget * parent) :
 	connect(m_BiomeView, SIGNAL(decreaseZoom()), this, SLOT(decreaseZoom()));
 	connect(m_BiomeView, SIGNAL(wheelUp()),      this, SLOT(increaseZoom()));
 	connect(m_BiomeView, SIGNAL(wheelDown()),    this, SLOT(decreaseZoom()));
+	m_BiomeView->setZoomLevel(m_ViewZooms[m_CurrentZoomLevel]);
 
 	m_StatusBar = new QStatusBar();
 	this->setStatusBar(m_StatusBar);
@@ -70,7 +73,7 @@ MainWindow::MainWindow(QWidget * parent) :
 
 MainWindow::~MainWindow()
 {
-
+	RegionLoader::shutdown();
 }
 
 
@@ -172,7 +175,8 @@ void MainWindow::setViewZoom()
 	{
 		return;
 	}
-	double newZoom = m_ViewZooms[action->data().toInt()];
+	m_CurrentZoomLevel = action->data().toInt();
+	double newZoom = m_ViewZooms[m_CurrentZoomLevel];
 	m_BiomeView->setZoomLevel(newZoom);
 	action->setChecked(true);
 }
@@ -284,15 +288,11 @@ void MainWindow::createActions()
 	{
 		m_actViewZoom[i] = new QAction(tr("&Zoom %1%").arg(std::floor(m_ViewZooms[i] * 100)), this);
 		m_actViewZoom[i]->setCheckable(true);
-		if ((int)(m_ViewZooms[i] * 16) == 16)
-		{
-			m_actViewZoom[i]->setChecked(true);
-			m_CurrentZoomLevel = i;
-		}
 		m_actViewZoom[i]->setData(QVariant(i));
 		zoomGroup->addAction(m_actViewZoom[i]);
 		connect(m_actViewZoom[i], SIGNAL(triggered()), this, SLOT(setViewZoom()));
 	}
+	m_actViewZoom[m_CurrentZoomLevel]->setChecked(true);
 }
 
 
diff --git a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
index f3a5255fb..9522491a8 100644
--- a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
+++ b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
@@ -12,76 +12,86 @@ TARGET = QtBiomeVisualiser
 TEMPLATE = app
 
 
-SOURCES +=\
-		MainWindow.cpp \
-    BiomeView.cpp \
-    ../../src/Generating/BioGen.cpp \
-    ../../src/VoronoiMap.cpp \
-    ../../src/Noise.cpp \
-    ../../src/StringUtils.cpp \
-    ../../src/LoggerListeners.cpp \
-    ../../src/Logger.cpp \
-		../../src/IniFile.cpp \
-    ../../src/OSSupport/File.cpp \
-    ../../src/OSSupport/CriticalSection.cpp \
-    ../../src/OSSupport/IsThread.cpp \
-    ../../src/BiomeDef.cpp \
-    ChunkCache.cpp \
-    ChunkSource.cpp \
-    ChunkLoader.cpp \
-    ../../src/StringCompression.cpp \
-    ../../src/WorldStorage/FastNBT.cpp \
-    ../../lib/zlib/adler32.c \
-    ../../lib/zlib/compress.c \
-    ../../lib/zlib/crc32.c \
-    ../../lib/zlib/deflate.c \
-    ../../lib/zlib/gzclose.c \
-    ../../lib/zlib/gzlib.c \
-    ../../lib/zlib/gzread.c \
-    ../../lib/zlib/gzwrite.c \
-    ../../lib/zlib/infback.c \
-    ../../lib/zlib/inffast.c \
-    ../../lib/zlib/inflate.c \
-    ../../lib/zlib/inftrees.c \
-    ../../lib/zlib/trees.c \
-    ../../lib/zlib/uncompr.c \
-    ../../lib/zlib/zutil.c \
-    GeneratorSetup.cpp \
-    QtBiomeVisualiser.cpp \
-    QtChunk.cpp
-
-HEADERS  += MainWindow.h \
-		Globals.h \
-		BiomeView.h \
-    ../../src/Generating/BioGen.h \
-    ../../src/VoronoiMap.h \
-    ../../src/Noise.h \
-    ../../src/StringUtils.h \
-    ../../src/LoggerListeners.h \
-    ../../src/Logger.h \
-		../../src/IniFile.h \
-    ../../src/OSSupport/File.h \
-    ../../src/OSSupport/CriticalSection.h \
-    ../../src/OSSupport/IsThread.h \
-    ../../src/BiomeDef.h \
-    ChunkCache.h \
-    ChunkSource.h \
-    ChunkLoader.h \
-    ../../src/StringCompression.h \
-    ../../src/WorldStorage/FastNBT.h \
-    ../../lib/zlib/crc32.h \
-    ../../lib/zlib/deflate.h \
-    ../../lib/zlib/gzguts.h \
-    ../../lib/zlib/inffast.h \
-    ../../lib/zlib/inffixed.h \
-    ../../lib/zlib/inflate.h \
-    ../../lib/zlib/inftrees.h \
-    ../../lib/zlib/trees.h \
-    ../../lib/zlib/zconf.h \
-    ../../lib/zlib/zlib.h \
-    ../../lib/zlib/zutil.h \
-    GeneratorSetup.h \
-    QtChunk.h
+SOURCES += \
+	MainWindow.cpp \
+	BiomeView.cpp \
+	../../src/Generating/BioGen.cpp \
+	../../src/VoronoiMap.cpp \
+	../../src/Noise.cpp \
+	../../src/StringUtils.cpp \
+	../../src/LoggerListeners.cpp \
+	../../src/Logger.cpp \
+	../../src/IniFile.cpp \
+	../../src/OSSupport/File.cpp \
+	../../src/OSSupport/CriticalSection.cpp \
+	../../src/OSSupport/IsThread.cpp \
+	../../src/BiomeDef.cpp \
+	../../src/StringCompression.cpp \
+	../../src/WorldStorage/FastNBT.cpp \
+	../../lib/zlib/adler32.c \
+	../../lib/zlib/compress.c \
+	../../lib/zlib/crc32.c \
+	../../lib/zlib/deflate.c \
+	../../lib/zlib/gzclose.c \
+	../../lib/zlib/gzlib.c \
+	../../lib/zlib/gzread.c \
+	../../lib/zlib/gzwrite.c \
+	../../lib/zlib/infback.c \
+	../../lib/zlib/inffast.c \
+	../../lib/zlib/inflate.c \
+	../../lib/zlib/inftrees.c \
+	../../lib/zlib/trees.c \
+	../../lib/zlib/uncompr.c \
+	../../lib/zlib/zutil.c \
+	GeneratorSetup.cpp \
+	QtBiomeVisualiser.cpp \
+	QtChunk.cpp \
+	RegionCache.cpp \
+	Region.cpp \
+	ChunkSource.cpp \
+	RegionLoader.cpp
+
+
+
+HEADERS += \
+	MainWindow.h \
+	QtChunk.h \
+	Globals.h \
+	BiomeView.h \
+	../../src/Generating/BioGen.h \
+	../../src/Generating/IntGen.h \
+	../../src/Generating/ProtIntGen.h \
+	../../src/VoronoiMap.h \
+	../../src/Noise.h \
+	../../src/StringUtils.h \
+	../../src/LoggerListeners.h \
+	../../src/Logger.h \
+	../../src/IniFile.h \
+	../../src/OSSupport/File.h \
+	../../src/OSSupport/CriticalSection.h \
+	../../src/OSSupport/IsThread.h \
+	../../src/BiomeDef.h \
+	../../src/StringCompression.h \
+	../../src/WorldStorage/FastNBT.h \
+	../../lib/zlib/crc32.h \
+	../../lib/zlib/deflate.h \
+	../../lib/zlib/gzguts.h \
+	../../lib/zlib/inffast.h \
+	../../lib/zlib/inffixed.h \
+	../../lib/zlib/inflate.h \
+	../../lib/zlib/inftrees.h \
+	../../lib/zlib/trees.h \
+	../../lib/zlib/zconf.h \
+	../../lib/zlib/zlib.h \
+	../../lib/zlib/zutil.h \
+	GeneratorSetup.h \
+	QtChunk.h \
+	RegionCache.h \
+	Region.h \
+	ChunkSource.h \
+	RegionLoader.h
+
+
 
 INCLUDEPATH += $$_PRO_FILE_PWD_ \
 	$$_PRO_FILE_PWD_/../../lib \
diff --git a/Tools/QtBiomeVisualiser/QtChunk.cpp b/Tools/QtBiomeVisualiser/QtChunk.cpp
index 031aa3654..f201ef220 100644
--- a/Tools/QtBiomeVisualiser/QtChunk.cpp
+++ b/Tools/QtBiomeVisualiser/QtChunk.cpp
@@ -5,138 +5,6 @@
 
 
 
-/** Map for converting biome values to colors. Initialized from biomeColors[]. */
-static uchar biomeToColor[256 * 4];
-
-/** Map for converting biome values to colors. Used to initialize biomeToColor[].*/
-static struct
-{
-	EMCSBiome m_Biome;
-	uchar m_Color[3];
-} biomeColors[] =
-{
-	{ biOcean,                { 0x00, 0x00, 0x70 }, },
-	{ biPlains,               { 0x8d, 0xb3, 0x60 }, },
-	{ biDesert,               { 0xfa, 0x94, 0x18 }, },
-	{ biExtremeHills,         { 0x60, 0x60, 0x60 }, },
-	{ biForest,               { 0x05, 0x66, 0x21 }, },
-	{ biTaiga,                { 0x0b, 0x66, 0x59 }, },
-	{ biSwampland,            { 0x2f, 0xff, 0xda }, },
-	{ biRiver,                { 0x30, 0x30, 0xaf }, },
-	{ biHell,                 { 0x7f, 0x00, 0x00 }, },
-	{ biSky,                  { 0x00, 0x7f, 0xff }, },
-	{ biFrozenOcean,          { 0xa0, 0xa0, 0xdf }, },
-	{ biFrozenRiver,          { 0xa0, 0xa0, 0xff }, },
-	{ biIcePlains,            { 0xff, 0xff, 0xff }, },
-	{ biIceMountains,         { 0xa0, 0xa0, 0xa0 }, },
-	{ biMushroomIsland,       { 0xff, 0x00, 0xff }, },
-	{ biMushroomShore,        { 0xa0, 0x00, 0xff }, },
-	{ biBeach,                { 0xfa, 0xde, 0x55 }, },
-	{ biDesertHills,          { 0xd2, 0x5f, 0x12 }, },
-	{ biForestHills,          { 0x22, 0x55, 0x1c }, },
-	{ biTaigaHills,           { 0x16, 0x39, 0x33 }, },
-	{ biExtremeHillsEdge,     { 0x7f, 0x8f, 0x7f }, },
-	{ biJungle,               { 0x53, 0x7b, 0x09 }, },
-	{ biJungleHills,          { 0x2c, 0x42, 0x05 }, },
-
-	{ biJungleEdge,           { 0x62, 0x8b, 0x17 }, },
-	{ biDeepOcean,            { 0x00, 0x00, 0x30 },	},
-	{ biStoneBeach,           { 0xa2, 0xa2, 0x84 },	},
-	{ biColdBeach,            { 0xfa, 0xf0, 0xc0 },	},
-	{ biBirchForest,          { 0x30, 0x74, 0x44 },	},
-	{ biBirchForestHills,     { 0x1f, 0x5f, 0x32 },	},
-	{ biRoofedForest,         { 0x40, 0x51, 0x1a },	},
-	{ biColdTaiga,            { 0x31, 0x55, 0x4a },	},
-	{ biColdTaigaHills,       { 0x59, 0x7d, 0x72 },	},
-	{ biMegaTaiga,            { 0x59, 0x66, 0x51 },	},
-	{ biMegaTaigaHills,       { 0x59, 0x66, 0x59 },	},
-	{ biExtremeHillsPlus,     { 0x50, 0x70, 0x50 },	},
-	{ biSavanna,              { 0xbd, 0xb2, 0x5f },	},
-	{ biSavannaPlateau,       { 0xa7, 0x9d, 0x64 },	},
-	{ biMesa,                 { 0xd9, 0x45, 0x15 },	},
-	{ biMesaPlateauF,         { 0xb0, 0x97, 0x65 },	},
-	{ biMesaPlateau,          { 0xca, 0x8c, 0x65 },	},
-
-	// M variants:
-	{ biSunflowerPlains,      { 0xb5, 0xdb, 0x88 }, },
-	{ biDesertM,              { 0xff, 0xbc, 0x40 }, },
-	{ biExtremeHillsM,        { 0x88, 0x88, 0x88 }, },
-	{ biFlowerForest,         { 0x2d, 0x8e, 0x49 }, },
-	{ biTaigaM,               { 0x33, 0x8e, 0x81 }, },
-	{ biSwamplandM,           { 0x07, 0xf9, 0xb2 }, },
-	{ biIcePlainsSpikes,      { 0xb4, 0xdc, 0xdc }, },
-	{ biJungleM,              { 0x7b, 0xa3, 0x31 }, },
-	{ biJungleEdgeM,          { 0x62, 0x8b, 0x17 }, },
-	{ biBirchForestM,         { 0x58, 0x9c, 0x6c }, },
-	{ biBirchForestHillsM,    { 0x47, 0x87, 0x5a }, },
-	{ biRoofedForestM,        { 0x68, 0x79, 0x42 }, },
-	{ biColdTaigaM,           { 0x24, 0x3f, 0x36 }, },
-	{ biMegaSpruceTaiga,      { 0x45, 0x4f, 0x3e }, },
-	{ biMegaSpruceTaigaHills, { 0x45, 0x4f, 0x4e }, },
-	{ biExtremeHillsPlusM,    { 0x78, 0x98, 0x78 }, },
-	{ biSavannaM,             { 0xe5, 0xda, 0x87 }, },
-	{ biSavannaPlateauM,      { 0xa7, 0x9d, 0x74 }, },
-	{ biMesaBryce,            { 0xff, 0x6d, 0x3d }, },
-	{ biMesaPlateauFM,        { 0xd8, 0xbf, 0x8d }, },
-	{ biMesaPlateauM,         { 0xf2, 0xb4, 0x8d }, },
-} ;
-
-
-
-
-
-static class BiomeColorsInitializer
-{
-public:
-	BiomeColorsInitializer(void)
-	{
-		// Reset all colors to gray:
-		for (size_t i = 0; i < ARRAYCOUNT(biomeToColor); i++)
-		{
-			biomeToColor[i] = 0x7f;
-		}
-
-		// Set known biomes to their colors:
-		for (size_t i = 0; i < ARRAYCOUNT(biomeColors); i++)
-		{
-			uchar * color = &biomeToColor[4 * biomeColors[i].m_Biome];
-			color[0] = biomeColors[i].m_Color[2];
-			color[1] = biomeColors[i].m_Color[1];
-			color[2] = biomeColors[i].m_Color[0];
-			color[3] = 0xff;
-		}
-	}
-} biomeColorInitializer;
-
-
-
-
-
-/** Converts biomes in an array into the chunk image data. */
-static void biomesToImage(const cChunkDef::BiomeMap & a_Biomes, Chunk::Image & a_Image)
-{
-	// Make sure the two arrays are of the same size, compile-time.
-	// Note that a_Image is actually 4 items per pixel, so the array is 4 times bigger:
-	static const char Check1[4 * ARRAYCOUNT(a_Biomes) - ARRAYCOUNT(a_Image)      + 1] = {};
-	static const char Check2[ARRAYCOUNT(a_Image)      - 4 * ARRAYCOUNT(a_Biomes) + 1] = {};
-
-	// Convert the biomes into color:
-	for (size_t i = 0; i < ARRAYCOUNT(a_Biomes); i++)
-	{
-		a_Image[4 * i + 0] = biomeToColor[4 * a_Biomes[i] + 0];
-		a_Image[4 * i + 1] = biomeToColor[4 * a_Biomes[i] + 1];
-		a_Image[4 * i + 2] = biomeToColor[4 * a_Biomes[i] + 2];
-		a_Image[4 * i + 3] = biomeToColor[4 * a_Biomes[i] + 3];
-	}
-}
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Chunk:
-
 Chunk::Chunk() :
 	m_IsValid(false)
 {
@@ -146,20 +14,12 @@ Chunk::Chunk() :
 
 
 
-const uchar * Chunk::getImage(void) const
-{
-	ASSERT(m_IsValid);
-	return m_Image;
-}
-
-
-
-
-
 void Chunk::setBiomes(const cChunkDef::BiomeMap & a_Biomes)
 {
-	memcpy(m_Biomes, a_Biomes, sizeof(m_Biomes));
-	renderBiomes();
+	for (size_t idx = 0; idx < ARRAYCOUNT(a_Biomes); ++idx)
+	{
+		m_Biomes[idx] = static_cast<short>(a_Biomes[idx]);
+	}
 	m_IsValid = true;
 }
 
@@ -173,16 +33,7 @@ EMCSBiome Chunk::getBiome(int a_RelX, int a_RelZ)
 	{
 		return biInvalidBiome;
 	}
-	return cChunkDef::GetBiome(m_Biomes, a_RelX, a_RelZ);
-}
-
-
-
-
-
-void Chunk::renderBiomes()
-{
-	biomesToImage(m_Biomes, m_Image);
+	return static_cast<EMCSBiome>(m_Biomes[a_RelX + 16 * a_RelZ]);
 }
 
 
diff --git a/Tools/QtBiomeVisualiser/QtChunk.h b/Tools/QtBiomeVisualiser/QtChunk.h
index 74321577a..d806d18bb 100644
--- a/Tools/QtBiomeVisualiser/QtChunk.h
+++ b/Tools/QtBiomeVisualiser/QtChunk.h
@@ -18,9 +18,6 @@ public:
 	/** Returns true iff the chunk data is valid - loaded or generated. */
 	bool isValid(void) const { return m_IsValid; }
 
-	/** Returns the image of the chunk's biomes. Assumes that the chunk is valid. */
-	const uchar * getImage(void) const;
-
 	/** Sets the biomes to m_Biomes and renders them into m_Image. */
 	void setBiomes(const cChunkDef::BiomeMap & a_Biomes);
 
@@ -28,19 +25,16 @@ public:
 	Coords must be valid inside this chunk. */
 	EMCSBiome getBiome(int a_RelX, int a_RelZ);
 
+	/** Returns the raw biome data for this chunk. */
+	const short * getBiomes(void) const { return m_Biomes; }
+
 protected:
 	/** Flag that specifies if the chunk data is valid - loaded or generated. */
 	bool m_IsValid;
 
-	/** Cached rendered image of this chunk's biomes. Updated in render(). */
-	Image m_Image;
-
-	/** Biomes comprising the chunk, in the X + 16 * Z ordering. */
-	cChunkDef::BiomeMap m_Biomes;
-
-
-	/** Renders biomes from m_Biomes into m_Image. */
-	void renderBiomes();
+	/** Biomes comprising the chunk, in the X + 16 * Z ordering.
+	Typed as short to save on memory, converted automatically when needed. */
+	short m_Biomes[16 * 16];
 };
 
 typedef std::shared_ptr<Chunk> ChunkPtr;
diff --git a/Tools/QtBiomeVisualiser/Region.cpp b/Tools/QtBiomeVisualiser/Region.cpp
new file mode 100644
index 000000000..d8a0a2f76
--- /dev/null
+++ b/Tools/QtBiomeVisualiser/Region.cpp
@@ -0,0 +1,72 @@
+
+#include "Globals.h"
+#include "Region.h"
+
+
+
+
+
+Region::Region()
+{
+}
+
+
+
+
+
+Chunk & Region::getRelChunk(int a_RelChunkX, int a_RelChunkZ)
+{
+		ASSERT(a_RelChunkX >= 0);
+		ASSERT(a_RelChunkZ >= 0);
+		ASSERT(a_RelChunkX < 32);
+		ASSERT(a_RelChunkZ < 32);
+
+		return m_Chunks[a_RelChunkX + a_RelChunkZ * 32];
+}
+
+
+
+
+
+int Region::getRelBiome(int a_RelBlockX, int a_RelBlockZ)
+{
+	ASSERT(a_RelBlockX >= 0);
+	ASSERT(a_RelBlockZ >= 0);
+	ASSERT(a_RelBlockX < 512);
+	ASSERT(a_RelBlockZ < 512);
+
+	int chunkX = a_RelBlockX / 16;
+	int chunkZ = a_RelBlockZ / 16;
+	Chunk & chunk = m_Chunks[chunkX + 32 * chunkZ];
+	if (chunk.isValid())
+	{
+		return chunk.getBiome(a_RelBlockX - 16 * chunkX, a_RelBlockZ - 16 * chunkZ);
+	}
+	else
+	{
+		return biInvalidBiome;
+	}
+}
+
+
+
+
+void Region::blockToRegion(int a_BlockX, int a_BlockZ, int & a_RegionX, int & a_RegionZ)
+{
+	a_RegionX = static_cast<int>(std::floor(static_cast<float>(a_BlockX) / 512));
+	a_RegionZ = static_cast<int>(std::floor(static_cast<float>(a_BlockZ) / 512));
+}
+
+
+
+
+
+void Region::chunkToRegion(int a_ChunkX, int a_ChunkZ, int & a_RegionX, int & a_RegionZ)
+{
+	a_RegionX = static_cast<int>(std::floor(static_cast<float>(a_ChunkX) / 32));
+	a_RegionZ = static_cast<int>(std::floor(static_cast<float>(a_ChunkZ) / 32));
+}
+
+
+
+
diff --git a/Tools/QtBiomeVisualiser/Region.h b/Tools/QtBiomeVisualiser/Region.h
new file mode 100644
index 000000000..863c0ac02
--- /dev/null
+++ b/Tools/QtBiomeVisualiser/Region.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "QtChunk.h"
+
+
+
+
+
+class Region
+{
+public:
+	Region();
+
+	/** Retrieves the chunk with the specified relative coords. */
+	Chunk & getRelChunk(int a_RelChunkX, int a_RelChunkZ);
+
+	/** Returns true iff the chunk data for all chunks has been loaded.
+	This doesn't mean that all the chunks are valid, only that the entire region has been processed and should
+	be displayed. */
+	bool isValid(void) const { return m_IsValid; }
+
+	/** Returns the biome in the block coords relative to this region.
+	Returns biInvalidBiome if the underlying chunk is not valid. */
+	int getRelBiome(int a_RelBlockX, int a_RelBlockZ);
+
+	/** Converts block coordinates into region coordinates. */
+	static void blockToRegion(int a_BlockX, int a_BlockZ, int & a_RegionX, int & a_RegionZ);
+
+	/** Converts chunk coordinates into region coordinates. */
+	static void chunkToRegion(int a_ChunkX, int a_ChunkZ, int & a_RegionX, int & a_RegionZ);
+
+protected:
+	friend class RegionLoader;
+
+
+	Chunk m_Chunks[32 * 32];
+
+	/** True iff the data for all the chunks has been loaded.
+	This doesn't mean that all the chunks are valid, only that the entire region has been processed and should
+	be displayed. */
+	bool m_IsValid;
+};
+
+
+
+
diff --git a/Tools/QtBiomeVisualiser/RegionCache.cpp b/Tools/QtBiomeVisualiser/RegionCache.cpp
new file mode 100644
index 000000000..e46fd222a
--- /dev/null
+++ b/Tools/QtBiomeVisualiser/RegionCache.cpp
@@ -0,0 +1,138 @@
+#include "Globals.h"
+#include "RegionCache.h"
+#include <QMutexLocker>
+#include <QThreadPool>
+#include "ChunkSource.h"
+#include "RegionLoader.h"
+#include "Region.h"
+
+
+
+
+
+RegionCache::RegionCache(QObject * parent) :
+	super(parent)
+{
+	m_Cache.setMaxCost(1024 * 1024 * 1024);  // 1 GiB of memory for the cache
+}
+
+
+
+
+
+RegionPtr RegionCache::fetch(int a_RegionX, int a_RegionZ)
+{
+	// Retrieve from the cache:
+	quint32 hash = getRegionHash(a_RegionX, a_RegionZ);
+	RegionPtr * res;
+	{
+		QMutexLocker lock(&m_Mtx);
+		res = m_Cache[hash];
+		// If succesful and region loaded, return the retrieved value:
+		if ((res != nullptr) && (*res)->isValid())
+		{
+			return *res;
+		}
+	}
+
+	// If the region is in cache but not valid, it means it has been already queued for rendering, do nothing now:
+	if (res != nullptr)
+	{
+		return RegionPtr(nullptr);
+	}
+
+	// There's no such item in the cache, create it now:
+	try
+	{
+		res = new RegionPtr(new Region);
+	}
+	catch (const std::bad_alloc &)
+	{
+		/* Allocation failed (32-bit process hit the 2 GiB barrier?)
+		This may happen even with the cache set to 1 GiB, because it contains shared ptrs and so they may be
+		held by another place in the code even when they are removed from cache.
+		*/
+		return RegionPtr(nullptr);
+	}
+	if (res == nullptr)
+	{
+		return RegionPtr(nullptr);
+	}
+	{
+		QMutexLocker lock(&m_Mtx);
+		m_Cache.insert(hash, res, sizeof(Region));
+	}
+
+	// Queue the region for rendering:
+	queueRegionRender(a_RegionX, a_RegionZ, *res);
+
+	// Return failure, the region is not yet rendered:
+	return RegionPtr(nullptr);
+}
+
+
+
+
+
+void RegionCache::setChunkSource(std::shared_ptr<ChunkSource> a_ChunkSource)
+{
+	// Replace the chunk source:
+	m_ChunkSource = a_ChunkSource;
+
+	// Clear the cache:
+	QMutexLocker lock(&m_Mtx);
+	m_Cache.clear();
+}
+
+
+
+
+
+void RegionCache::reload()
+{
+	assert(m_ChunkSource.get() != nullptr);
+
+	// Reload the chunk source:
+	m_ChunkSource->reload();
+
+	// Clear the cache:
+	QMutexLocker lock(&m_Mtx);
+	m_Cache.clear();
+}
+
+
+
+
+
+void RegionCache::gotRegion(int a_RegionX, int a_RegionZ)
+{
+	emit regionAvailable(a_RegionX, a_RegionZ);
+}
+
+
+
+
+
+quint32 RegionCache::getRegionHash(int a_RegionX, int a_RegionZ)
+{
+	// Simply join the two coords into a single int
+	// The coords will never be larger than 16-bits, so we can do this safely
+	return (((static_cast<quint32>(a_RegionX) & 0xffff) << 16) | (static_cast<quint32>(a_RegionZ) & 0xffff));
+}
+
+
+
+
+
+void RegionCache::queueRegionRender(int a_RegionX, int a_RegionZ, RegionPtr & a_Region)
+{
+	// Create a new loader task:
+	RegionLoader * loader = new RegionLoader(a_RegionX, a_RegionZ, a_Region, m_ChunkSource);
+	connect(loader, SIGNAL(loaded(int, int)), this, SLOT(gotRegion(int, int)));
+
+	QThreadPool::globalInstance()->start(loader);
+}
+
+
+
+
diff --git a/Tools/QtBiomeVisualiser/ChunkCache.h b/Tools/QtBiomeVisualiser/RegionCache.h
index 8d198f02f..c343e4ba9 100644
--- a/Tools/QtBiomeVisualiser/ChunkCache.h
+++ b/Tools/QtBiomeVisualiser/RegionCache.h
@@ -9,8 +9,9 @@
 
 
 
-class Chunk;
-typedef std::shared_ptr<Chunk> ChunkPtr;
+// fwd:
+class Region;
+typedef std::shared_ptr<Region> RegionPtr;
 
 class ChunkSource;
 
@@ -18,19 +19,19 @@ class ChunkSource;
 
 
 
-/** Caches chunk data for reuse */
-class ChunkCache :
+/** Caches regions' chunk data for reuse */
+class RegionCache :
 	public QObject
 {
 	typedef QObject super;
 	Q_OBJECT
 
 public:
-	explicit ChunkCache(QObject * parent = NULL);
+	explicit RegionCache(QObject * parent = NULL);
 
-	/** Retrieves the specified chunk from the cache.
-	Only returns valid chunks; if the chunk is invalid, queues it for rendering and returns an empty ptr. */
-	ChunkPtr fetch(int a_ChunkX, int a_ChunkZ);
+	/** Retrieves the specified region from the cache.
+	Only returns valid regions; if the region is invalid, queues it for rendering and returns an empty ptr. */
+	RegionPtr fetch(int a_RegionX, int a_RegionZ);
 
 	/** Replaces the chunk source used by the biome view to get the chunk biome data.
 	The cache is then invalidated. */
@@ -43,16 +44,16 @@ public:
 	void reload();
 
 signals:
-	void chunkAvailable(int a_ChunkX, int a_ChunkZ);
+	void regionAvailable(int a_RegionX, int a_RegionZ);
 
 protected slots:
-	void gotChunk(int a_ChunkX, int a_ChunkZ);
+	void gotRegion(int a_RegionX, int a_RegionZ);
 
 protected:
 	/** The cache of the chunks */
-	QCache<quint32, ChunkPtr> m_Cache;
+	QCache<quint32, RegionPtr> m_Cache;
 
-	/** Locks te cache against multithreaded access */
+	/** Locks the cache against multithreaded access */
 	QMutex m_Mtx;
 
 	/** The source used to get the biome data. */
@@ -60,10 +61,10 @@ protected:
 
 
 	/** Returns the hash used by the chunk in the cache */
-	quint32 getChunkHash(int a_ChunkX, int a_ChunkZ);
+	quint32 getRegionHash(int a_RegionX, int a_RegionZ);
 
-	/** Queues the specified chunk for rendering by m_ChunkSource. */
-	void queueChunkRender(int a_ChunkX, int a_ChunkZ, ChunkPtr & a_Chunk);
+	/** Queues the specified region for rendering by m_RegionSource. */
+	void queueRegionRender(int a_RegionX, int a_RegionZ, RegionPtr & a_Region);
 };
 
 
diff --git a/Tools/QtBiomeVisualiser/RegionLoader.cpp b/Tools/QtBiomeVisualiser/RegionLoader.cpp
new file mode 100644
index 000000000..2a318098b
--- /dev/null
+++ b/Tools/QtBiomeVisualiser/RegionLoader.cpp
@@ -0,0 +1,49 @@
+#include "Globals.h"
+#include "RegionLoader.h"
+#include "ChunkSource.h"
+#include "Region.h"
+
+
+
+
+
+volatile bool RegionLoader::m_IsShuttingDown = false;
+
+
+
+
+
+RegionLoader::RegionLoader(int a_RegionX, int a_RegionZ, RegionPtr a_Region, ChunkSourcePtr a_ChunkSource) :
+	m_RegionX(a_RegionX),
+	m_RegionZ(a_RegionZ),
+	m_Region(a_Region),
+	m_ChunkSource(a_ChunkSource)
+{
+}
+
+
+
+
+
+void RegionLoader::run()
+{
+	// Load all the chunks in this region:
+	for (int z = 0; z < 32; z++)
+	{
+		for (int x = 0; x < 32; x++)
+		{
+			m_ChunkSource->getChunkBiomes(m_RegionX * 32 + x, m_RegionZ * 32 + z, m_Region->getRelChunk(x, z));
+			if (m_IsShuttingDown)
+			{
+				return;
+			}
+		}
+	}
+	m_Region->m_IsValid = true;
+
+	emit loaded(m_RegionX, m_RegionZ);
+}
+
+
+
+
diff --git a/Tools/QtBiomeVisualiser/RegionLoader.h b/Tools/QtBiomeVisualiser/RegionLoader.h
new file mode 100644
index 000000000..6bbb4aa60
--- /dev/null
+++ b/Tools/QtBiomeVisualiser/RegionLoader.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <QObject>
+#include <QRunnable>
+#include <memory>
+
+
+
+
+// fwd:
+class Region;
+typedef std::shared_ptr<Region> RegionPtr;
+
+class ChunkSource;
+typedef std::shared_ptr<ChunkSource> ChunkSourcePtr;
+
+
+
+
+
+class RegionLoader :
+	public QObject,
+	public QRunnable
+{
+	Q_OBJECT
+
+public:
+	RegionLoader(int a_RegionX, int a_RegionZ, RegionPtr a_Region, ChunkSourcePtr a_ChunkSource);
+	virtual ~RegionLoader() {}
+
+	/** Signals to all loaders that the app is shutting down and the loading should be aborted. */
+	static void shutdown() { m_IsShuttingDown = true; }
+
+signals:
+	void loaded(int a_RegionX, int a_RegionZ);
+
+protected:
+	virtual void run() override;
+
+private:
+	/** Coords of the region to be loaded. */
+	int m_RegionX, m_RegionZ;
+
+	/** The region to be loaded. */
+	RegionPtr m_Region;
+
+	/** The chunk source to be used for individual chunks within the region. */
+	ChunkSourcePtr m_ChunkSource;
+
+	/** Flag that is set upon app exit to terminate the queued loaders faster. */
+	static volatile bool m_IsShuttingDown;
+};
+
+
+
+
diff --git a/app.yml b/app.yml
new file mode 100644
index 000000000..44edf0852
--- /dev/null
+++ b/app.yml
@@ -0,0 +1,11 @@
+name: MCServer
+image: ubuntu-14-04-x64
+config:
+  #cloud-config
+  packages:
+    - curl
+    - screen
+  runcmd:
+    - mkdir /minecraft
+    - cd /minecraft && curl -s https://raw.githubusercontent.com/mc-server/MCServer/master/easyinstall.sh | sh
+    - cd /minecraft/MCServer && screen -S mcserver -d -m ./MCServer
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index d1e9923b4..c13e36188 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -247,7 +247,11 @@ public:
 	template <typename FnT, typename... Args>
 	bool Call(const FnT & a_Function, Args &&... args)
 	{
-		PushFunction(a_Function);
+		if (!PushFunction(a_Function))
+		{
+			// Pushing the function failed
+			return false;
+		}
 		return PushCallPop(args...);
 	}
 
diff --git a/src/BiomeDef.cpp b/src/BiomeDef.cpp
index 02f8c2232..188e06173 100644
--- a/src/BiomeDef.cpp
+++ b/src/BiomeDef.cpp
@@ -160,3 +160,65 @@ bool IsBiomeNoDownfall(EMCSBiome a_Biome)
 		}
 	}
 }
+
+
+
+
+
+bool IsBiomeVeryCold(EMCSBiome a_Biome)
+{
+	switch (a_Biome)
+	{
+		case biFrozenOcean:
+		case biFrozenRiver:
+		case biIcePlains:
+		case biIceMountains:
+		case biColdBeach:
+		case biColdTaiga:
+		case biColdTaigaHills:
+		case biIcePlainsSpikes:
+		case biColdTaigaM:
+		{
+			return true;
+		}
+		default:
+		{
+			return false;
+		}
+	}
+}
+
+
+
+
+bool IsBiomeCold(EMCSBiome a_Biome)
+{
+	switch (a_Biome)
+	{
+		case biExtremeHills:
+		case biTaiga:
+		case biTaigaHills:
+		case biExtremeHillsEdge:
+		case biStoneBeach:
+		case biMegaTaiga:
+		case biMegaTaigaHills:
+		case biExtremeHillsPlus:
+		case biExtremeHillsM:
+		case biTaigaM:
+		case biColdTaigaM:
+		case biMegaSpruceTaiga:
+		case biMegaSpruceTaigaHills:
+		case biExtremeHillsPlusM:
+		{
+			return true;
+		}
+		default:
+		{
+			return false;
+		}
+	}
+}
+
+
+
+
diff --git a/src/BiomeDef.h b/src/BiomeDef.h
index f929596e9..84751cfd7 100644
--- a/src/BiomeDef.h
+++ b/src/BiomeDef.h
@@ -113,5 +113,20 @@ extern AString BiomeToString(int a_Biome);
 /** Returns true if the biome has no downfall - deserts and savannas */
 extern bool IsBiomeNoDownfall(EMCSBiome a_Biome);
 
+/** Returns true if the biome is an ocean biome. */
+inline bool IsBiomeOcean(int a_Biome)
+{
+	return ((a_Biome == biOcean) || (a_Biome == biDeepOcean));
+}
+
+/** Returns true if the biome is very cold
+(has snow on ground everywhere, turns top water to ice, has snowfall instead of rain everywhere).
+Doesn't report mildly cold biomes (where it snows above certain elevation), use IsBiomeCold() for those. */
+extern bool IsBiomeVeryCold(EMCSBiome a_Biome);
+
+/** Returns true if the biome is cold
+(has snow and snowfall at higher elevations but not at regular heights).
+Doesn't report Very Cold biomes, use IsBiomeVeryCold() for those. */
+extern bool IsBiomeCold(EMCSBiome a_Biome);
 
 // tolua_end
diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index c0f3193bb..c98e0cad1 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -217,7 +217,12 @@ BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString)
 
 bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item)
 {
-	return gsBlockIDMap.ResolveItem(TrimString(a_ItemTypeString), a_Item);
+	AString ItemName = TrimString(a_ItemTypeString);
+	if (ItemName.substr(0, 10) == "minecraft:")
+	{
+		ItemName = ItemName.substr(10);
+	}
+	return gsBlockIDMap.ResolveItem(ItemName, a_Item);
 }
 
 
diff --git a/src/BlockID.h b/src/BlockID.h
index bb06722d2..24de2dc8a 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -1,7 +1,13 @@
 #pragma once
 
+// The following hackery is to allow typed C++ enum for C++ code, yet have ToLua process the values.
+// ToLua doesn't understand typed enums, so we use preprocessor to hide it from ToLua.
+
+enum ENUM_BLOCK_ID : BLOCKTYPE
+#if 0
+enum ENUM_BLOCK_ID  // tolua_export
+#endif
 // tolua_begin
-enum ENUM_BLOCK_ID
 {
 	E_BLOCK_AIR = 0,
 	E_BLOCK_STONE = 1,
@@ -221,6 +227,10 @@ enum ENUM_BLOCK_ID
 };
 // tolua_end
 
+
+
+
+
 // tolua_begin
 enum ENUM_ITEM_ID
 {
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 595040a54..8a8f17a1b 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -822,6 +822,7 @@ void cChunkMap::WakeUpSimulatorsInArea(int a_MinBlockX, int a_MaxBlockX, int a_M
 	int MinChunkX, MinChunkZ, MaxChunkX, MaxChunkZ;
 	cChunkDef::BlockToChunk(a_MinBlockX, a_MinBlockZ, MinChunkX, MinChunkZ);
 	cChunkDef::BlockToChunk(a_MaxBlockX, a_MaxBlockZ, MaxChunkX, MaxChunkZ);
+	cCSLock Lock(m_CSLayers);
 	for (int z = MinChunkZ; z <= MaxChunkZ; z++)
 	{
 		int MinZ = std::max(a_MinBlockZ, z * cChunkDef::Width);
diff --git a/src/ChunkSender.cpp b/src/ChunkSender.cpp
index ef2be167b..83d82884e 100644
--- a/src/ChunkSender.cpp
+++ b/src/ChunkSender.cpp
@@ -184,7 +184,7 @@ void cChunkSender::Execute(void)
 	while (!m_ShouldTerminate)
 	{
 		cCSLock Lock(m_CS);
-		while (m_ChunksReady.empty() && m_SendChunksLowPriority.empty() && m_SendChunksHighPriority.empty())
+		while (m_ChunksReady.empty() && m_SendChunksLowPriority.empty() && m_SendChunksMediumPriority.empty() && m_SendChunksHighPriority.empty())
 		{
 			int RemoveCount = m_RemoveCount;
 			m_RemoveCount = 0;
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index faee05450..94bace43a 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -557,7 +557,7 @@ void cClientHandle::UnloadOutOfRangeChunks(void)
 	for (cChunkCoordsList::iterator itr = ChunksToRemove.begin(); itr != ChunksToRemove.end(); ++itr)
 	{
 		m_Player->GetWorld()->RemoveChunkClient(itr->m_ChunkX, itr->m_ChunkZ, this);
-		m_Protocol->SendUnloadChunk(itr->m_ChunkX, itr->m_ChunkZ);
+		SendUnloadChunk(itr->m_ChunkX, itr->m_ChunkZ);
 	}
 }
 
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 203faff56..2a4dbe794 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -5,6 +5,10 @@
 
 #include "Globals.h"
 #include "BioGen.h"
+#include <chrono>
+#include <iostream>
+#include "IntGen.h"
+#include "ProtIntGen.h"
 #include "../IniFile.h"
 #include "../LinearUpscale.h"
 
@@ -917,6 +921,214 @@ void cBioGenTwoLevel::InitializeBiomeGen(cIniFile & a_IniFile)
 
 
 ////////////////////////////////////////////////////////////////////////////////
+// cBioGenGrown:
+
+class cBioGenGrown:
+	public cBiomeGen
+{
+public:
+	cBioGenGrown(int a_Seed)
+	{
+		auto FinalRivers =
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 1,
+			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 2,
+			std::make_shared<cIntGenRiver <7>>   (a_Seed + 3,
+			std::make_shared<cIntGenZoom  <9>>   (a_Seed + 4,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 8,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 9,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 10,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 6,
+			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 11,
+			std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12
+		))))))))))))));
+
+		auto alteration =
+			std::make_shared<cIntGenZoom     <8>>(a_Seed,
+			std::make_shared<cIntGenLandOcean<6>>(a_Seed, 20
+		));
+
+		auto alteration2 =
+			std::make_shared<cIntGenZoom     <8>>(a_Seed + 1,
+			std::make_shared<cIntGenZoom     <6>>(a_Seed + 2,
+			std::make_shared<cIntGenZoom     <5>>(a_Seed + 1,
+			std::make_shared<cIntGenZoom     <4>>(a_Seed + 2,
+			std::make_shared<cIntGenLandOcean<4>>(a_Seed + 1, 10
+		)))));
+
+		auto FinalBiomes =
+			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 15,
+			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1,
+			std::make_shared<cIntGenZoom           <9>> (a_Seed + 16,
+			std::make_shared<cIntGenBeaches        <6>> (
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 1,
+			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2004, 10,
+			std::make_shared<cIntGenAddToOcean     <6>> (a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cIntGenReplaceRandomly<8>> (a_Seed + 1, biPlains, biSunflowerPlains, 20,
+			std::make_shared<cIntGenMBiomes        <8>> (a_Seed + 5, alteration2,
+			std::make_shared<cIntGenAlternateBiomes<8>> (a_Seed + 1, alteration,
+			std::make_shared<cIntGenBiomeEdges     <8>> (a_Seed + 3,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 2,
+			std::make_shared<cIntGenZoom           <7>> (a_Seed + 4,
+			std::make_shared<cIntGenReplaceRandomly<5>> (a_Seed + 99, biIcePlains, biIcePlainsSpikes, 50,
+			std::make_shared<cIntGenZoom           <5>> (a_Seed + 8,
+			std::make_shared<cIntGenAddToOcean     <4>> (a_Seed + 10, 300, biDeepOcean,
+			std::make_shared<cIntGenAddToOcean     <6>> (a_Seed + 9, 8, biMushroomIsland,
+			std::make_shared<cIntGenBiomes         <8>> (a_Seed + 3000,
+			std::make_shared<cIntGenAddIslands     <8>> (a_Seed + 2000, 200,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 5,
+			std::make_shared<cIntGenRareBiomeGroups<6>> (a_Seed + 5, 50,
+			std::make_shared<cIntGenBiomeGroupEdges<6>> (
+			std::make_shared<cIntGenAddIslands     <8>> (a_Seed + 2000, 200,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 7,
+			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 8, 50, bgOcean,
+			std::make_shared<cIntGenReplaceRandomly<6>> (a_Seed + 101, bgIce, bgTemperate, 150,
+			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 200,
+			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 9, 50, bgOcean,
+			std::make_shared<cIntGenZoom           <6>> (a_Seed + 10,
+			std::make_shared<cIntGenLandOcean      <5>> (a_Seed + 100, 30
+		)))))))))))))))))))))))))))))));
+
+		m_Gen =
+			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
+			std::make_shared<cIntGenZoom     <18>>(a_Seed,
+			std::make_shared<cIntGenSmooth   <11>>(a_Seed,
+			std::make_shared<cIntGenZoom     <13>>(a_Seed,
+			std::make_shared<cIntGenMixRivers<8>> (
+			FinalBiomes, FinalRivers
+		)))));
+	}
+
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
+	{
+		cIntGen<16, 16>::Values vals;
+		m_Gen->GetInts(a_ChunkX * cChunkDef::Width, a_ChunkZ * cChunkDef::Width, vals);
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				cChunkDef::SetBiome(a_Biomes, x, z, (EMCSBiome)vals[x + cChunkDef::Width * z]);
+			}
+		}
+	}
+
+protected:
+	std::shared_ptr<cIntGen<16, 16>> m_Gen;
+};
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cBioGenGrown:
+
+class cBioGenProtGrown:
+	public cBiomeGen
+{
+public:
+	cBioGenProtGrown(int a_Seed)
+	{
+		auto FinalRivers =
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 2,
+			std::make_shared<cProtIntGenRiver >(a_Seed + 3,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 4,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 8,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 9,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 10,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 6,
+			std::make_shared<cProtIntGenZoom  >(a_Seed + 11,
+			std::make_shared<cProtIntGenChoice>(a_Seed + 12, 2
+		))))))))))))));
+
+		auto alteration =
+			std::make_shared<cProtIntGenZoom     >(a_Seed,
+			std::make_shared<cProtIntGenLandOcean>(a_Seed, 20
+		));
+
+		auto alteration2 =
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 2,
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom     >(a_Seed + 2,
+			std::make_shared<cProtIntGenLandOcean>(a_Seed + 1, 10
+		)))));
+
+		auto FinalBiomes =
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 15,
+			std::make_shared<cProtIntGenSmooth         >(a_Seed + 1,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 16,
+			std::make_shared<cProtIntGenBeaches        >(
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 1,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2004, 10,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 1, biPlains, biSunflowerPlains, 20,
+			std::make_shared<cProtIntGenMBiomes        >(a_Seed + 5, alteration2,
+			std::make_shared<cProtIntGenAlternateBiomes>(a_Seed + 1, alteration,
+			std::make_shared<cProtIntGenBiomeEdges     >(a_Seed + 3,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 2,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 4,
+			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 99, biIcePlains, biIcePlainsSpikes, 50,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 8,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 10, 300, biDeepOcean,
+			std::make_shared<cProtIntGenAddToOcean     >(a_Seed + 9, 8, biMushroomIsland,
+			std::make_shared<cProtIntGenBiomes         >(a_Seed + 3000,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 200,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 5,
+			std::make_shared<cProtIntGenRareBiomeGroups>(a_Seed + 5, 50,
+			std::make_shared<cProtIntGenBiomeGroupEdges>(
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 200,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 7,
+			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 8, 50, bgOcean,
+			std::make_shared<cProtIntGenReplaceRandomly>(a_Seed + 101, bgIce, bgTemperate, 150,
+			std::make_shared<cProtIntGenAddIslands     >(a_Seed + 2000, 200,
+			std::make_shared<cProtIntGenSetRandomly    >(a_Seed + 9, 50, bgOcean,
+			std::make_shared<cProtIntGenZoom           >(a_Seed + 10,
+			std::make_shared<cProtIntGenLandOcean      >(a_Seed + 100, 30
+		)))))))))))))))))))))))))))))));
+
+		m_Gen =
+			std::make_shared<cProtIntGenSmooth   >(a_Seed,
+			std::make_shared<cProtIntGenZoom     >(a_Seed,
+			std::make_shared<cProtIntGenSmooth   >(a_Seed,
+			std::make_shared<cProtIntGenZoom     >(a_Seed,
+			std::make_shared<cProtIntGenMixRivers>(
+			FinalBiomes, FinalRivers
+		)))));
+	}
+
+	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
+	{
+		int vals[16 * 16];
+		m_Gen->GetInts(a_ChunkX * cChunkDef::Width, a_ChunkZ * cChunkDef::Width, 16, 16, vals);
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				cChunkDef::SetBiome(a_Biomes, x, z, (EMCSBiome)vals[x + cChunkDef::Width * z]);
+			}
+		}
+	}
+
+protected:
+	std::shared_ptr<cProtIntGen> m_Gen;
+};
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
 // cBiomeGen:
 
 cBiomeGenPtr cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool & a_CacheOffByDefault)
@@ -952,6 +1164,14 @@ cBiomeGenPtr cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool &
 	{
 		res = new cBioGenTwoLevel(a_Seed);
 	}
+	else if (NoCaseCompare(BiomeGenName, "grown") == 0)
+	{
+		res = new cBioGenGrown(a_Seed);
+	}
+	else if (NoCaseCompare(BiomeGenName, "grownprot") == 0)
+	{
+		res = new cBioGenProtGrown(a_Seed);
+	}
 	else
 	{
 		if (NoCaseCompare(BiomeGenName, "multistepmap") != 0)
@@ -981,3 +1201,51 @@ cBiomeGenPtr cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool &
 
 
 
+
+////////////////////////////////////////////////////////////////////////////////
+// Performance tests:
+
+// Change to 1 to enable the perf test:
+#if 0
+
+class cBioGenPerfTest
+{
+public:
+	cBioGenPerfTest()
+	{
+		std::cout << "BioGen performance tests commencing, please wait..." << std::endl;
+		TestGen("MultiStepMap", std::make_unique<cBioGenMultiStepMap>(1).get());
+		TestGen("Grown",        std::make_unique<cBioGenGrown>(1).get());
+		TestGen("GrownProt",    std::make_unique<cBioGenProtGrown>(1).get());
+		std::cout << "BioGen performance tests complete." << std::endl;
+	}
+
+protected:
+	void TestGen(const AString && a_GenName, cBiomeGen * a_BioGen)
+	{
+		// Initialize the default settings for the generator:
+		cIniFile iniFile;
+		a_BioGen->InitializeBiomeGen(iniFile);
+
+		// Generate the biomes:
+		auto start = std::chrono::system_clock::now();
+		for (int z = 0; z < 100; z++)
+		{
+			for (int x = 0; x < 100; x++)
+			{
+				cChunkDef::BiomeMap biomes;
+				a_BioGen->GenBiomes(x, z, biomes);
+			}  // for x
+		}  // for z
+		auto dur = std::chrono::system_clock::now() - start;
+		double milliseconds = static_cast<double>((std::chrono::duration_cast<std::chrono::milliseconds>(dur)).count());
+
+		std::cout << a_GenName << ": " << 1000.0 * 100.0 * 100.0 / milliseconds << " chunks per second" << std::endl;
+	}
+} g_BioGenPerfTest;
+
+#endif
+
+
+
+
diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index cd3d5a9f3..1a26bd0d5 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -46,6 +46,7 @@ SET (HDRS
 	FinishGen.h
 	GridStructGen.h
 	HeiGen.h
+	IntGen.h
 	MineShafts.h
 	NetherFortGen.h
 	Noise3DGenerator.h
@@ -53,6 +54,7 @@ SET (HDRS
 	PieceGenerator.h
 	Prefab.h
 	PrefabPiecePool.h
+	ProtIntGen.h
 	RainbowRoadsGen.h
 	Ravines.h
 	RoughRavines.h
diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index aac1d2bf3..d5bc6ab55 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -227,15 +227,15 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biMesaPlateau      */ { 2.0f,  2.0f},  // 39
 	
 	// biomes 40 .. 128 are unused, 89 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 40 .. 49
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 50 .. 59
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 60 .. 69
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 70 .. 79
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 80 .. 89
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 90 .. 99
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 100 .. 109
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 110 .. 119
-	{}, {}, {}, {}, {}, {}, {}, {}, {},      // 120 .. 128
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 40 .. 49
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 50 .. 59
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 60 .. 69
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 70 .. 79
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 80 .. 89
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 90 .. 99
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 100 .. 109
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 110 .. 119
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},                // 120 .. 128
 	
 	// Release 1.7 /* biome variants:
 	/* biSunflowerPlains      */ { 1.0f,  1.0f},  // 129
@@ -246,22 +246,22 @@ const cDistortedHeightmap::sGenParam cDistortedHeightmap::m_GenParam[256] =
 	/* biSwamplandM           */ { 0.0f,  0.0f},  // 134
 	
 	// Biomes 135 .. 139 unused, 5 empty placeholders here:
-	{}, {}, {}, {}, {},                           // 135 .. 139
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 135 .. 139
 
 	/* biIcePlainsSpikes      */ { 1.0f,  1.0f},  // 140
 	
 	// Biomes 141 .. 148 unused, 8 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {},               // 141 .. 148
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},  // 141 .. 148
 
 	/* biJungleM              */ { 4.0f,  4.0f},  // 149
-	{},                                           // 150
+	{0.0f, 0.0f},                                 // 150
 	/* biJungleEdgeM          */ { 3.0f,  3.0f},  // 151
-	{}, {}, {},                                   // 152 .. 154
+	{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f},     // 152 .. 154
 	/* biBirchForestM         */ { 3.0f,  3.0f},  // 155
 	/* biBirchForestHillsM    */ { 5.0f,  5.0f},  // 156
 	/* biRoofedForestM        */ { 2.0f,  2.0f},  // 157
 	/* biColdTaigaM           */ { 1.0f,  1.0f},  // 158
-	{},                                           // 159
+	{0.0f, 0.0f},                                 // 159
 	/* biMegaSpruceTaiga      */ { 3.0f,  3.0f},  // 160
 	/* biMegaSpruceTaigaHills */ { 3.0f,  3.0f},  // 161
 	/* biExtremeHillsPlusM    */ {32.0f, 32.0f},  // 162
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 0564789dc..18f8ee2bc 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -414,6 +414,11 @@ void cFinishGenSnow::GenFinish(cChunkDesc & a_ChunkDesc)
 					}
 					break;
 				}
+				default:
+				{
+					// There's no snow in the other biomes.
+					break;
+				}
 			}
 		}
 	}  // for z
@@ -454,6 +459,11 @@ void cFinishGenIce::GenFinish(cChunkDesc & a_ChunkDesc)
 					}
 					break;
 				}
+				default:
+				{
+					// No icy water in other biomes.
+					break;
+				}
 			}
 		}
 	}  // for z
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index a0b8770f5..28a5698e4 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -17,81 +17,6 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// cTerrainHeightGen:
-
-cTerrainHeightGenPtr cTerrainHeightGen::CreateHeightGen(cIniFile & a_IniFile, cBiomeGenPtr a_BiomeGen, int a_Seed, bool & a_CacheOffByDefault)
-{
-	AString HeightGenName = a_IniFile.GetValueSet("Generator", "HeightGen", "");
-	if (HeightGenName.empty())
-	{
-		LOGWARN("[Generator] HeightGen value not set in world.ini, using \"Biomal\".");
-		HeightGenName = "Biomal";
-	}
-	
-	a_CacheOffByDefault = false;
-	cTerrainHeightGen * res = nullptr;
-	if (NoCaseCompare(HeightGenName, "flat") == 0)
-	{
-		res = new cHeiGenFlat;
-		a_CacheOffByDefault = true;  // We're generating faster than a cache would retrieve data
-	}
-	else if (NoCaseCompare(HeightGenName, "classic") == 0)
-	{
-		res = new cHeiGenClassic(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "DistortedHeightmap") == 0)
-	{
-		res = new cDistortedHeightmap(a_Seed, a_BiomeGen);
-	}
-	else if (NoCaseCompare(HeightGenName, "End") == 0)
-	{
-		res = new cEndGen(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "Mountains") == 0)
-	{
-		res = new cHeiGenMountains(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "Noise3D") == 0)
-	{
-		res = new cNoise3DComposable(a_Seed);
-	}
-	else if (NoCaseCompare(HeightGenName, "biomal") == 0)
-	{
-		res = new cHeiGenBiomal(a_Seed, a_BiomeGen);
-
-		/*
-		// Performance-testing:
-		LOGINFO("Measuring performance of cHeiGenBiomal...");
-		clock_t BeginTick = clock();
-		for (int x = 0; x < 500; x++)
-		{
-			cChunkDef::HeightMap Heights;
-			res->GenHeightMap(x * 5, x * 5, Heights);
-		}
-		clock_t Duration = clock() - BeginTick;
-		LOGINFO("HeightGen for 500 chunks took %d ticks (%.02f sec)", Duration, (double)Duration / CLOCKS_PER_SEC);
-		//*/
-	}
-	else
-	{
-		// No match found, force-set the default and retry
-		LOGWARN("Unknown HeightGen \"%s\", using \"Biomal\" instead.", HeightGenName.c_str());
-		a_IniFile.DeleteValue("Generator", "HeightGen");
-		a_IniFile.SetValue("Generator", "HeightGen", "Biomal");
-		return CreateHeightGen(a_IniFile, a_BiomeGen, a_Seed, a_CacheOffByDefault);
-	}
-	
-	// Read the settings:
-	res->InitializeHeightGen(a_IniFile);
-	
-	return cTerrainHeightGenPtr(res);
-}
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
 // cHeiGenFlat:
 
 void cHeiGenFlat::GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap)
@@ -430,15 +355,15 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	/* biMesaPlateau         */ { 0.1f,   1.0f,  0.05f,     1.5f,  0.01f,    4.0f,  80},
 	
 	// biomes 40 .. 128 are unused, 89 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 40 .. 49
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 50 .. 59
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 60 .. 69
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 70 .. 79
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 80 .. 89
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 90 .. 99
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 100 .. 109
-	{}, {}, {}, {}, {}, {}, {}, {}, {}, {},  // 110 .. 119
-	{}, {}, {}, {}, {}, {}, {}, {}, {},      // 120 .. 128
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 40 .. 49
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 50 .. 59
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 60 .. 69
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 70 .. 79
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 80 .. 89
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 90 .. 99
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 100 .. 109
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 110 .. 119
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                           // 120 .. 128
 	
 	/* biSunflowerPlains      */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 129
 	/* biDesertM              */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 130
@@ -448,22 +373,22 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
 	/* biSwamplandM           */ { 1.0f,   3.0f,  1.10f,     7.0f,  0.01f,   0.01f,  60},  // 134
 	
 	// Biomes 135 .. 139 unused, 5 empty placeholders here:
-	{}, {}, {}, {}, {},                                                                    // 135 .. 139
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 135 .. 139
 	
 	/* biIcePlainsSpikes      */ { 0.1f,   2.0f,  0.05f,    12.0f,  0.01f,   10.0f,  40},  // 140
 	
 	// Biomes 141 .. 148 unused, 8 empty placeholders here:
-	{}, {}, {}, {}, {}, {}, {}, {},                                                        // 141 .. 148
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 141 .. 148
 	
 	/* biJungleM              */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 149
-	{},                                                                                    // 150
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                               // 150
 	/* biJungleEdgeM          */ { 0.1f,   3.0f,  0.05f,     6.0f,  0.01f,    6.0f,  70},  // 151
-	{}, {}, {},                                                                            // 152 .. 154
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0}, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},  // 152 .. 154
 	/* biBirchForestM         */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 155
 	/* biBirchForestHillsM    */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 156
 	/* biRoofedForestM        */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 157
 	/* biColdTaigaM           */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 158
-	{},                                                                                    // 159
+	{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0},                                               // 159
 	/* biMegaSpruceTaiga      */ { 0.1f,   1.0f,  0.05f,     2.0f,  0.01f,    4.0f,  70},  // 160
 	/* biMegaSpruceTaigaHills */ { 0.2f,   2.0f,  0.05f,    10.0f,  0.01f,    8.0f,  80},  // 161
 	/* biExtremeHillsPlusM    */ { 0.2f,   4.0f,  0.05f,    20.0f,  0.01f,   16.0f, 120},  // 162
@@ -611,3 +536,283 @@ NOISE_DATATYPE cHeiGenBiomal::GetHeightAt(int a_RelX, int a_RelZ, int a_ChunkX,
 
 
 
+////////////////////////////////////////////////////////////////////////////////
+// cHeiGenMinMax:
+
+class cHeiGenMinMax:
+	public cTerrainHeightGen
+{
+	typedef cTerrainHeightGen super;
+
+	/** Size of the averaging process, in columns (for each direction). Must be less than 16. */
+	static const int AVERAGING_SIZE = 4;
+
+public:
+	cHeiGenMinMax(int a_Seed, cBiomeGenPtr a_BiomeGen):
+		m_Noise(a_Seed),
+		m_BiomeGen(a_BiomeGen),
+		m_TotalWeight(0)
+	{
+		// Initialize the weights:
+		for (int z = 0; z <= AVERAGING_SIZE * 2; z++)
+		{
+			for (int x = 0; x <= AVERAGING_SIZE * 2; x++)
+			{
+				m_Weights[z][x] = 1 + 2 * AVERAGING_SIZE - std::abs(x - AVERAGING_SIZE) - std::abs(z - AVERAGING_SIZE);
+				m_TotalWeight += m_Weights[z][x];
+			}
+		}
+
+		// Initialize the Perlin generator:
+		m_Perlin.AddOctave(0.04f,   0.2f);
+		m_Perlin.AddOctave(0.02f,   0.1f);
+		m_Perlin.AddOctave(0.01f,   0.05f);
+	}
+
+
+	virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap)
+	{
+		// Generate the biomes for the 3*3 neighbors:
+		cChunkDef::BiomeMap neighborBiomes[3][3];
+		for (int z = 0; z < 3; z++) for (int x = 0; x < 3; x++)
+		{
+			m_BiomeGen->GenBiomes(a_ChunkX + x - 1, a_ChunkZ + z - 1, neighborBiomes[z][x]);
+		}
+
+		// Get the min and max heights based on the biomes:
+		double minHeight[cChunkDef::Width * cChunkDef::Width];
+		double maxHeight[cChunkDef::Width * cChunkDef::Width];
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				// For each column, sum the min and max values of the neighborhood around it:
+				double min = 0, max = 0;
+				for (int relz = 0; relz <= AVERAGING_SIZE * 2; relz++)
+				{
+					int bz = z + 16 + relz - AVERAGING_SIZE;  // Biome Z coord relative to the neighborBiomes start
+					int cz = bz / 16;                         // Chunk Z coord relative to the neighborBiomes start
+					bz = bz % 16;                             // Biome Z coord relative to cz in neighborBiomes
+					for (int relx = 0; relx <= AVERAGING_SIZE * 2; relx++)
+					{
+						int bx = x + 16 + relx - AVERAGING_SIZE;  // Biome X coord relative to the neighborBiomes start
+						int cx = bx / 16;                         // Chunk X coord relative to the neighborBiomes start
+						bx = bx % 16;                             // Biome X coord relative to cz in neighborBiomes
+
+						// Get the biome's min and max heights:
+						double bmin, bmax;
+						getBiomeMinMax(cChunkDef::GetBiome(neighborBiomes[cz][cx], bx, bz), bmin, bmax);
+
+						// Add them to the total, with the weight depending on their relative position to the column:
+						min += bmin * m_Weights[relz][relx];
+						max += bmax * m_Weights[relz][relx];
+					}  // for relx
+				}  // for relz
+				minHeight[x + z * cChunkDef::Width] = min / m_TotalWeight;
+				maxHeight[x + z * cChunkDef::Width] = max / m_TotalWeight;
+			}  // for x
+		}  // for z
+
+		// Generate the base noise:
+		NOISE_DATATYPE noise[cChunkDef::Width * cChunkDef::Width];
+		NOISE_DATATYPE workspace[cChunkDef::Width * cChunkDef::Width];
+		NOISE_DATATYPE startX = static_cast<float>(a_ChunkX * cChunkDef::Width);
+		NOISE_DATATYPE endX = startX + cChunkDef::Width - 1;
+		NOISE_DATATYPE startZ = static_cast<float>(a_ChunkZ * cChunkDef::Width);
+		NOISE_DATATYPE endZ = startZ + cChunkDef::Width - 1;
+		m_Perlin.Generate2D(noise, 16, 16, startX, endX, startZ, endZ, workspace);
+
+		// Make the height by ranging the noise between min and max:
+		for (int z = 0; z < cChunkDef::Width; z++)
+		{
+			for (int x = 0; x < cChunkDef::Width; x++)
+			{
+				double min = minHeight[x + z * cChunkDef::Width];
+				double max = maxHeight[x + z * cChunkDef::Width];
+				double h = (max + min) / 2 + noise[x + z * cChunkDef::Width] * (max - min);
+				cChunkDef::SetHeight(a_HeightMap, x, z, static_cast<HEIGHTTYPE>(h));
+			}
+		}
+	}
+
+	
+	virtual void InitializeHeightGen(cIniFile & a_IniFile)
+	{
+		// No settings available
+	}
+
+protected:
+	cNoise m_Noise;
+
+	cPerlinNoise m_Perlin;
+
+	/** The biome generator to query for the underlying biomes. */
+	cBiomeGenPtr m_BiomeGen;
+
+	/** Weights applied to each of the min / max values in the neighborhood of the currently evaluated column. */
+	double m_Weights[AVERAGING_SIZE * 2 + 1][AVERAGING_SIZE * 2 + 1];
+
+	/** Sum of all the m_Weights items. */
+	double m_TotalWeight;
+
+
+	/** Returns the minimum and maximum heights for the given biome. */
+	void getBiomeMinMax(EMCSBiome a_Biome, double & a_Min, double & a_Max)
+	{
+		switch (a_Biome)
+		{
+			case biBeach:                a_Min = 61; a_Max = 64; break;
+			case biBirchForest:          a_Min = 63; a_Max = 75; break;
+			case biBirchForestHills:     a_Min = 63; a_Max = 90; break;
+			case biBirchForestHillsM:    a_Min = 63; a_Max = 90; break;
+			case biBirchForestM:         a_Min = 63; a_Max = 75; break;
+			case biColdBeach:            a_Min = 61; a_Max = 64; break;
+			case biColdTaiga:            a_Min = 63; a_Max = 75; break;
+			case biColdTaigaHills:       a_Min = 63; a_Max = 90; break;
+			case biColdTaigaM:           a_Min = 63; a_Max = 75; break;
+			case biDeepOcean:            a_Min = 30; a_Max = 60; break;
+			case biDesert:               a_Min = 63; a_Max = 70; break;
+			case biDesertHills:          a_Min = 63; a_Max = 85; break;
+			case biDesertM:              a_Min = 63; a_Max = 70; break;
+			case biEnd:                  a_Min = 10; a_Max = 100; break;
+			case biExtremeHills:         a_Min = 60; a_Max = 120; break;
+			case biExtremeHillsEdge:     a_Min = 63; a_Max = 100; break;
+			case biExtremeHillsM:        a_Min = 60; a_Max = 120; break;
+			case biExtremeHillsPlus:     a_Min = 60; a_Max = 140; break;
+			case biExtremeHillsPlusM:    a_Min = 60; a_Max = 140; break;
+			case biFlowerForest:         a_Min = 63; a_Max = 75; break;
+			case biForest:               a_Min = 63; a_Max = 75; break;
+			case biForestHills:          a_Min = 63; a_Max = 90; break;
+			case biFrozenOcean:          a_Min = 45; a_Max = 64; break;
+			case biFrozenRiver:          a_Min = 60; a_Max = 62; break;
+			case biIceMountains:         a_Min = 63; a_Max = 90; break;
+			case biIcePlains:            a_Min = 63; a_Max = 70; break;
+			case biIcePlainsSpikes:      a_Min = 60; a_Max = 70; break;
+			case biJungle:               a_Min = 60; a_Max = 80; break;
+			case biJungleEdge:           a_Min = 62; a_Max = 75; break;
+			case biJungleEdgeM:          a_Min = 62; a_Max = 75; break;
+			case biJungleHills:          a_Min = 60; a_Max = 90; break;
+			case biJungleM:              a_Min = 60; a_Max = 75; break;
+			case biMegaSpruceTaiga:      a_Min = 63; a_Max = 75; break;
+			case biMegaSpruceTaigaHills: a_Min = 63; a_Max = 90; break;
+			case biMegaTaiga:            a_Min = 63; a_Max = 75; break;
+			case biMegaTaigaHills:       a_Min = 63; a_Max = 90; break;
+			case biMesa:                 a_Min = 63; a_Max = 90; break;
+			case biMesaBryce:            a_Min = 60; a_Max = 67; break;
+			case biMesaPlateau:          a_Min = 75; a_Max = 85; break;
+			case biMesaPlateauF:         a_Min = 80; a_Max = 90; break;
+			case biMesaPlateauFM:        a_Min = 80; a_Max = 90; break;
+			case biMesaPlateauM:         a_Min = 75; a_Max = 85; break;
+			case biMushroomIsland:       a_Min = 63; a_Max = 90; break;
+			case biMushroomShore:        a_Min = 60; a_Max = 75; break;
+			case biNether:               a_Min = 10; a_Max = 100; break;
+			case biOcean:                a_Min = 45; a_Max = 64; break;
+			case biPlains:               a_Min = 63; a_Max = 70; break;
+			case biRiver:                a_Min = 60; a_Max = 62; break;
+			case biRoofedForest:         a_Min = 63; a_Max = 75; break;
+			case biRoofedForestM:        a_Min = 63; a_Max = 75; break;
+			case biSavanna:              a_Min = 63; a_Max = 75; break;
+			case biSavannaM:             a_Min = 63; a_Max = 80; break;
+			case biSavannaPlateau:       a_Min = 75; a_Max = 100; break;
+			case biSavannaPlateauM:      a_Min = 80; a_Max = 160; break;
+			case biStoneBeach:           a_Min = 60; a_Max = 64; break;
+			case biSunflowerPlains:      a_Min = 63; a_Max = 70; break;
+			case biSwampland:            a_Min = 60; a_Max = 67; break;
+			case biSwamplandM:           a_Min = 61; a_Max = 67; break;
+			case biTaiga:                a_Min = 63; a_Max = 75; break;
+			case biTaigaHills:           a_Min = 63; a_Max = 90; break;
+			case biTaigaM:               a_Min = 63; a_Max = 80; break;
+			default:
+			{
+				ASSERT(!"Unknown biome");
+				a_Min = 10;
+				a_Max = 10;
+				break;
+			}
+		}
+	}
+};
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cTerrainHeightGen:
+
+cTerrainHeightGenPtr cTerrainHeightGen::CreateHeightGen(cIniFile & a_IniFile, cBiomeGenPtr a_BiomeGen, int a_Seed, bool & a_CacheOffByDefault)
+{
+	AString HeightGenName = a_IniFile.GetValueSet("Generator", "HeightGen", "");
+	if (HeightGenName.empty())
+	{
+		LOGWARN("[Generator] HeightGen value not set in world.ini, using \"Biomal\".");
+		HeightGenName = "Biomal";
+	}
+	
+	a_CacheOffByDefault = false;
+	cTerrainHeightGen * res = nullptr;
+	if (NoCaseCompare(HeightGenName, "flat") == 0)
+	{
+		res = new cHeiGenFlat;
+		a_CacheOffByDefault = true;  // We're generating faster than a cache would retrieve data
+	}
+	else if (NoCaseCompare(HeightGenName, "classic") == 0)
+	{
+		res = new cHeiGenClassic(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "DistortedHeightmap") == 0)
+	{
+		res = new cDistortedHeightmap(a_Seed, a_BiomeGen);
+	}
+	else if (NoCaseCompare(HeightGenName, "End") == 0)
+	{
+		res = new cEndGen(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "MinMax") == 0)
+	{
+		res = new cHeiGenMinMax(a_Seed, a_BiomeGen);
+	}
+	else if (NoCaseCompare(HeightGenName, "Mountains") == 0)
+	{
+		res = new cHeiGenMountains(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "Noise3D") == 0)
+	{
+		res = new cNoise3DComposable(a_Seed);
+	}
+	else if (NoCaseCompare(HeightGenName, "biomal") == 0)
+	{
+		res = new cHeiGenBiomal(a_Seed, a_BiomeGen);
+
+		/*
+		// Performance-testing:
+		LOGINFO("Measuring performance of cHeiGenBiomal...");
+		clock_t BeginTick = clock();
+		for (int x = 0; x < 500; x++)
+		{
+			cChunkDef::HeightMap Heights;
+			res->GenHeightMap(x * 5, x * 5, Heights);
+		}
+		clock_t Duration = clock() - BeginTick;
+		LOGINFO("HeightGen for 500 chunks took %d ticks (%.02f sec)", Duration, (double)Duration / CLOCKS_PER_SEC);
+		//*/
+	}
+	else
+	{
+		// No match found, force-set the default and retry
+		LOGWARN("Unknown HeightGen \"%s\", using \"Biomal\" instead.", HeightGenName.c_str());
+		a_IniFile.DeleteValue("Generator", "HeightGen");
+		a_IniFile.SetValue("Generator", "HeightGen", "Biomal");
+		return CreateHeightGen(a_IniFile, a_BiomeGen, a_Seed, a_CacheOffByDefault);
+	}
+	
+	// Read the settings:
+	res->InitializeHeightGen(a_IniFile);
+	
+	return cTerrainHeightGenPtr(res);
+}
+
+
+
+
+
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
new file mode 100644
index 000000000..b25e378c0
--- /dev/null
+++ b/src/Generating/IntGen.h
@@ -0,0 +1,1406 @@
+
+// IntGen.h
+
+// Declares the cIntGen class and descendants for generating and filtering various 2D arrays of ints
+
+/*
+The integers generated may be interpreted in several ways:
+- land/see designators
+	- 0 = ocean
+	- >0 = land
+- biome group
+	- 0 = ocean
+	- 1 = desert biomes
+	- 2 = temperate biomes
+	- 3 = mountains (hills and forests)
+	- 4 = ice biomes
+- biome group with "bgfRare" flag (for generating rare biomes for the group)
+- biome IDs
+The interpretation depends on the generator used and on the position in the chain.
+
+The generators can be chained together - one produces data that another one consumes.
+Some of such chain connections require changing the data dimensions between the two, which is handled automatically
+by using templates.
+*/
+
+
+
+
+
+#pragma once
+
+#include "../BiomeDef.h"
+
+
+
+
+
+/** Constants representing the biome group designators. */
+const int bgOcean        = 0;
+const int bgDesert       = 1;
+const int bgTemperate    = 2;
+const int bgMountains    = 3;
+const int bgIce          = 4;
+const int bgLandOceanMax = 4;  // Maximum biome group value generated in the landOcean generator
+const int bgfRare        = 1024;  // Flag added to values to generate rare biomes for the group
+
+
+
+
+
+/** Interface that all the generator classes provide. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGen
+{
+public:
+	/** Force a virtual destructor in all descendants.
+	Descendants contain virtual functions and are referred to via pointer-to-base, so they need a virtual destructor. */
+	virtual ~cIntGen() {}
+
+	/** Holds the array of values generated by this class (descendant). */
+	typedef int Values[SizeX * SizeZ];
+
+	/** Generates the array of templated size into a_Values, based on given min coords. */
+	virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) = 0;
+};
+
+
+
+
+
+/** Provides additional cNoise member and its helper functions. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenWithNoise :
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+
+public:
+	cIntGenWithNoise(int a_Seed) :
+		m_Noise(a_Seed)
+	{
+	}
+
+protected:
+	cNoise m_Noise;
+
+	/** Chooses one of a_Val1 or a_Val2, based on m_Noise and the coordinates for querying the noise. */
+	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		return ((rnd & 1) == 0) ? a_Val1 : a_Val2;
+	}
+
+	/** Chooses one of a_ValN, based on m_Noise and the coordinates for querying the noise. */
+	int ChooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2, int a_Val3, int a_Val4)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		switch (rnd % 4)
+		{
+			case 0:  return a_Val1;
+			case 1:  return a_Val2;
+			case 2:  return a_Val3;
+			default: return a_Val4;
+		}
+	}
+};
+
+
+
+
+
+
+/** Generates a 2D array of random integers in the specified range [0 .. Range). */
+template <int Range, int SizeX, int SizeZ = SizeX>
+class cIntGenChoice :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	cIntGenChoice(int a_Seed) :
+		super(a_Seed)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < SizeX; x++)
+			{
+				a_Values[x + SizeX * z] = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % Range;
+			}
+		}  // for z
+	}
+};
+
+
+
+
+
+
+/** Decides between the ocean and landmass biomes.
+Has a threshold (in percent) of how much land, the larger the threshold, the more land.
+Generates 0 for ocean, biome group ID for landmass. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenLandOcean :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	cIntGenLandOcean(int a_Seed, int a_Threshold) :
+		super(a_Seed),
+		m_Threshold(a_Threshold)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int rnd = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
+				a_Values[x + SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 101) % bgLandOceanMax + 1) : 0;
+			}
+		}
+
+		// If the centerpoint of the world is within the area, set it to bgTemperate, always:
+		if ((a_MinX <= 0) && (a_MinZ <= 0) && (a_MinX + SizeX > 0) && (a_MinZ + SizeZ > 0))
+		{
+			a_Values[-a_MinX - a_MinZ * SizeX] = bgTemperate;
+		}
+	}
+
+protected:
+	int m_Threshold;
+};
+
+
+
+
+
+/** Zooms the underlying value array to twice the size. Uses random-neighbor for the pixels in-between.
+This means that the zoome out image is randomly distorted. Applying zoom several times provides all
+the distortion that the generators need. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenZoom :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+protected:
+	static const int m_LowerSizeX = (SizeX / 2) + 2;
+	static const int m_LowerSizeZ = (SizeZ / 2) + 2;
+
+public:
+	typedef std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>> Underlying;
+
+
+	cIntGenZoom(int a_Seed, Underlying a_UnderlyingGen) :
+		super(a_Seed),
+		m_UnderlyingGen(a_UnderlyingGen)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data with half the resolution:
+		int lowerMinX = a_MinX >> 1;
+		int lowerMinZ = a_MinZ >> 1;
+		int lowerData[m_LowerSizeX * m_LowerSizeZ];
+		m_UnderlyingGen->GetInts(lowerMinX, lowerMinZ, lowerData);
+		const int lowStepX = (m_LowerSizeX - 1) * 2;
+		const int lowStepZ = (m_LowerSizeZ - 1) * 2;
+		int cache[lowStepX * lowStepZ];
+
+		// Discreet-interpolate the values into twice the size:
+		for (int z = 0; z < m_LowerSizeZ - 1; ++z)
+		{
+			int idx = (z * 2) * lowStepX;
+			int PrevZ0 = lowerData[z * m_LowerSizeX];
+			int PrevZ1 = lowerData[(z + 1) * m_LowerSizeX];
+
+			for (int x = 0; x < m_LowerSizeX - 1; ++x)
+			{
+				int ValX1Z0 = lowerData[x + 1 + z * m_LowerSizeX];
+				int ValX1Z1 = lowerData[x + 1 + (z + 1) * m_LowerSizeX];
+				int RndX = (x + lowerMinX) * 2;
+				int RndZ = (z + lowerMinZ) * 2;
+				cache[idx] = PrevZ0;
+				cache[idx + lowStepX] = super::ChooseRandomOne(RndX, RndZ + 1, PrevZ0, PrevZ1);
+				cache[idx + 1]        = super::ChooseRandomOne(RndX, RndZ - 1, PrevZ0, ValX1Z0);
+				cache[idx + 1 + lowStepX] = super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
+				idx += 2;
+				PrevZ0 = ValX1Z0;
+				PrevZ1 = ValX1Z1;
+			}
+		}
+
+		// Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
+		for (int z = 0; z < SizeZ; ++z)
+		{
+			memcpy(a_Values + z * SizeX, cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), SizeX * sizeof(int));
+		}
+	}
+
+protected:
+	Underlying m_UnderlyingGen;
+};
+
+
+
+
+
+/** Smoothes out some artifacts generated by the zooming - mostly single-pixel values.
+Compares each pixel to its neighbors and if the neighbors are equal, changes the pixel to their value. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenSmooth :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int m_LowerSizeX = SizeX + 2;
+	static const int m_LowerSizeZ = SizeZ + 2;
+
+public:
+	typedef std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>> Underlying;
+
+
+	cIntGenSmooth(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying values:
+		int lowerData[m_LowerSizeX * m_LowerSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerData);
+
+		// Smooth - for each square check if the surroundings are the same, if so, expand them diagonally.
+		// Also get rid of single-pixel irregularities (A-B-A):
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int NoiseZ = a_MinZ + z;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val   = lowerData[x + 1 + (z + 1) * m_LowerSizeX];
+				int above = lowerData[x + 1 +  z      * m_LowerSizeX];
+				int below = lowerData[x + 1 + (z + 2) * m_LowerSizeX];
+				int left  = lowerData[x     + (z + 1) * m_LowerSizeX];
+				int right = lowerData[x + 2 + (z + 1) * m_LowerSizeX];
+
+				if ((left == right) && (above == below))
+				{
+					if (((super::m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
+					{
+						val = left;
+					}
+					else
+					{
+						val = above;
+					}
+				}
+				else
+				{
+					if (left == right)
+					{
+						val = left;
+					}
+
+					if (above == below)
+					{
+						val = above;
+					}
+				}
+
+				a_Values[x + z * SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Converts land biomes at the edge of an ocean into the respective beach biome. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenBeaches :
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+	static const int m_UnderlyingSizeX = SizeX + 2;
+	static const int m_UnderlyingSizeZ = SizeZ + 2;
+
+public:
+	typedef std::shared_ptr<cIntGen<m_UnderlyingSizeX, m_UnderlyingSizeZ>> Underlying;
+
+
+	cIntGenBeaches(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Map for biome -> its beach:
+		static const int ToBeach[] =
+		{
+			/* biOcean            */ biOcean,
+			/* biPlains           */ biBeach,
+			/* biDesert           */ biBeach,
+			/* biExtremeHills     */ biStoneBeach,
+			/* biForest           */ biBeach,
+			/* biTaiga            */ biColdBeach,
+			/* biSwampland        */ biSwampland,
+			/* biRiver            */ biRiver,
+			/* biNether           */ biNether,
+			/* biEnd              */ biEnd,
+			/* biFrozenOcean      */ biColdBeach,
+			/* biFrozenRiver      */ biColdBeach,
+			/* biIcePlains        */ biColdBeach,
+			/* biIceMountains     */ biColdBeach,
+			/* biMushroomIsland   */ biMushroomShore,
+			/* biMushroomShore    */ biMushroomShore,
+			/* biBeach            */ biBeach,
+			/* biDesertHills      */ biBeach,
+			/* biForestHills      */ biBeach,
+			/* biTaigaHills       */ biColdBeach,
+			/* biExtremeHillsEdge */ biStoneBeach,
+			/* biJungle           */ biBeach,
+			/* biJungleHills      */ biBeach,
+			/* biJungleEdge       */ biBeach,
+			/* biDeepOcean        */ biOcean,
+			/* biStoneBeach       */ biStoneBeach,
+			/* biColdBeach        */ biColdBeach,
+			/* biBirchForest      */ biBeach,
+			/* biBirchForestHills */ biBeach,
+			/* biRoofedForest     */ biBeach,
+			/* biColdTaiga        */ biColdBeach,
+			/* biColdTaigaHills   */ biColdBeach,
+			/* biMegaTaiga        */ biStoneBeach,
+			/* biMegaTaigaHills   */ biStoneBeach,
+			/* biExtremeHillsPlus */ biStoneBeach,
+			/* biSavanna          */ biBeach,
+			/* biSavannaPlateau   */ biBeach,
+			/* biMesa             */ biMesa,
+			/* biMesaPlateauF     */ biMesa,
+			/* biMesaPlateau      */ biMesa,
+		};
+
+		// Generate the underlying values:
+		int lowerValues[m_UnderlyingSizeX * m_UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerValues);
+
+		// Add beaches between ocean and biomes:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val   = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
+				int above = lowerValues[x + 1 + z       * m_UnderlyingSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * m_UnderlyingSizeX];
+				int left  = lowerValues[x     + (z + 1) * m_UnderlyingSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * m_UnderlyingSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					if (IsBiomeOcean(above) || IsBiomeOcean(below) || IsBiomeOcean(left) || IsBiomeOcean(right))
+					{
+						// First convert the value to a regular biome (drop the M flag), then modulo by our biome count:
+						val = ToBeach[(val % 128) % ARRAYCOUNT(ToBeach)];
+					}
+				}
+				a_Values[x + z * SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Generates the underlying numbers and then randomly changes some ocean group pixels into random land
+biome group pixels, based on the predefined chance. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenAddIslands :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenAddIslands(int a_Seed, int a_Chance, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				if (a_Values[x + z * SizeX] == bgOcean)
+				{
+					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
+					if (rnd % 1000 < m_Chance)
+					{
+						a_Values[x + z * SizeX] = (rnd / 1003) % bgLandOceanMax;
+					}
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	/** Chance, in permille, of an island being generated in ocean. */
+	int m_Chance;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** A filter that adds an edge biome group between two biome groups that need an edge between them. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenBiomeGroupEdges :
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+
+	static const int m_UnderlyingSizeX = SizeX + 2;
+	static const int m_UnderlyingSizeZ = SizeZ + 2;
+
+public:
+
+	typedef std::shared_ptr<cIntGen<m_UnderlyingSizeX, m_UnderlyingSizeZ>> Underlying;
+
+	cIntGenBiomeGroupEdges(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values)
+	{
+		// Generate the underlying biome groups:
+		int lowerValues[m_UnderlyingSizeX * m_UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX, a_MinZ, lowerValues);
+
+		// Change the biomes on incompatible edges into an edge biome:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val   = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
+				int above = lowerValues[x + 1 + z       * m_UnderlyingSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * m_UnderlyingSizeX];
+				int left  = lowerValues[x     + (z + 1) * m_UnderlyingSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * m_UnderlyingSizeX];
+				switch (val)
+				{
+					// Desert should neighbor only oceans, desert and temperates; change to temperate when another:
+					case bgDesert:
+					{
+						if (
+							!isDesertCompatible(above) ||
+							!isDesertCompatible(below) ||
+							!isDesertCompatible(left) ||
+							!isDesertCompatible(right)
+						)
+						{
+							val = bgTemperate;
+						}
+						break;
+					}  // case bgDesert
+
+					// Ice should not neighbor deserts; change to temperate:
+					case bgIce:
+					{
+						if (
+							(above == bgDesert) ||
+							(below == bgDesert) ||
+							(left  == bgDesert) ||
+							(right == bgDesert)
+						)
+						{
+							val = bgTemperate;
+						}
+						break;
+					}  // case bgIce
+				}
+				a_Values[x + z * SizeX] = val;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+
+
+	inline bool isDesertCompatible(int a_BiomeGroup)
+	{
+		switch (a_BiomeGroup)
+		{
+			case bgOcean:
+			case bgDesert:
+			case bgTemperate:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+};
+
+
+
+
+
+/** Turns biome group indices into real biomes.
+For each pixel, takes its biome group and chooses a random biome from that group; replaces the value with
+that biome. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenBiomes :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenBiomes(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Define the per-biome-group biomes:
+		static const int oceanBiomes[] =
+		{
+			biOcean,  // biDeepOcean,
+		};
+
+		// Same as oceanBiomes, there are no rare oceanic biomes (mushroom islands are handled separately)
+		static const int rareOceanBiomes[] =
+		{
+			biOcean,
+		};
+
+		static const int desertBiomes[] =
+		{
+			biDesert, biDesert, biDesert, biDesert, biDesert, biDesert, biSavanna, biSavanna, biPlains,
+		};
+
+		static const int rareDesertBiomes[] =
+		{
+			biMesaPlateau, biMesaPlateauF,
+		};
+
+		static const int temperateBiomes[] =
+		{
+			biForest, biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
+		};
+
+		static const int rareTemperateBiomes[] =
+		{
+			biJungle,  // Jungle is not strictly temperate, but let's piggyback it here
+		};
+
+		static const int mountainBiomes[] =
+		{
+			biExtremeHills, biForest, biTaiga, biPlains,
+		};
+
+		static const int rareMountainBiomes[] =
+		{
+			biMegaTaiga,
+		};
+
+		static const int iceBiomes[] =
+		{
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
+		};
+
+		// Same as iceBiomes, there's no rare ice biome
+		static const int rareIceBiomes[] =
+		{
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
+		};
+
+		static const cBiomesInGroups biomesInGroups[] =
+		{
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(oceanBiomes)),     oceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(desertBiomes)),    desertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(mountainBiomes)),  mountainBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(iceBiomes)),       iceBiomes},
+		};
+
+		static const cBiomesInGroups rareBiomesInGroups[] =
+		{
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(rareOceanBiomes)),     rareOceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(rareDesertBiomes)),    rareDesertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(rareTemperateBiomes)), rareTemperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(rareMountainBiomes)),  rareMountainBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(rareIceBiomes)),       rareIceBiomes},
+		};
+
+		// Generate the underlying values, representing biome groups:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Overwrite each biome group with a random biome from that group:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int IdxZ = z * SizeX;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val = a_Values[x + IdxZ];
+				const cBiomesInGroups & Biomes = (val > bgfRare) ?
+					rareBiomesInGroups[(val & (bgfRare - 1)) % ARRAYCOUNT(rareBiomesInGroups)] :
+					biomesInGroups[val % ARRAYCOUNT(biomesInGroups)];
+				int rnd = (super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
+				a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
+			}
+		}
+	}
+
+protected:
+
+	struct cBiomesInGroups
+	{
+		const int Count;
+		const int * Biomes;
+	};
+
+
+	/** The underlying int generator */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Randomly replaces pixels of one value to another value, using the given chance. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenReplaceRandomly :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenReplaceRandomly(int a_From, int a_To, int a_Chance, int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_From(a_From),
+		m_To(a_To),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying values:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Replace some of the values:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int idxZ = z * SizeX;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (a_Values[idx] == m_From)
+				{
+					int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+					if (rnd % 1000 < m_Chance)
+					{
+						a_Values[idx] = m_To;
+					}
+				}
+			}
+		}  // for z
+	}
+
+
+protected:
+	/** The original value to be replaced. */
+	int m_From;
+
+	/** The destination value to which to replace. */
+	int m_To;
+
+	/** Chance, in permille, of replacing the value. */
+	int m_Chance;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Mixer that joins together finalized biomes and rivers.
+It first checks for oceans, if there is an ocean in the Biomes, it keeps the ocean.
+If there's no ocean, it checks Rivers for a river, if there is a river, it uses the Biomes to select either
+regular river or frozen river, based on the biome. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenMixRivers:
+	public cIntGen<SizeX, SizeZ>
+{
+	typedef cIntGen<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenMixRivers(Underlying a_Biomes, Underlying a_Rivers):
+		m_Biomes(a_Biomes),
+		m_Rivers(a_Rivers)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data:
+		m_Biomes->GetInts(a_MinX, a_MinZ, a_Values);
+		typename super::Values riverData;
+		m_Rivers->GetInts(a_MinX, a_MinZ, riverData);
+
+		// Mix the values:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			int idxZ = z * SizeX;
+			for (int x = 0; x < SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (IsBiomeOcean(a_Values[idx]))
+				{
+					// Oceans are kept without any changes
+					continue;
+				}
+				if (riverData[idx] != biRiver)
+				{
+					// There's no river, keep the current value
+					continue;
+				}
+
+				// There's a river, change the output to a river or a frozen river, based on the original biome:
+				if (IsBiomeVeryCold((EMCSBiome)a_Values[idx]))
+				{
+					a_Values[idx] = biFrozenRiver;
+				}
+				else
+				{
+					a_Values[idx] = biRiver;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Biomes;
+	Underlying m_Rivers;
+};
+
+
+
+
+
+/** Generates a river based on the underlying data.
+This is basically an edge detector over the underlying data. The rivers are the edges where the underlying data
+changes from one pixel to its neighbor. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenRiver:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int UnderlyingSizeX = SizeX + 2;
+	static const int UnderlyingSizeZ = SizeZ + 2;
+
+public:
+	typedef std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>> Underlying;
+
+
+	cIntGenRiver(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data:
+		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+
+		// Detect the edges:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int Above = Cache[x + 1 + z * UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
+				int Left  = Cache[x +     (z + 1) * UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
+				int val   = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
+
+				if ((val == Above) && (val == Below) && (val == Left) && (val == Right))
+				{
+					val = 0;
+				}
+				else
+				{
+					val = biRiver;
+				}
+				a_Values[x + z * SizeX] = val;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Turns some of the oceans into the specified biome. Used for mushroom and deep ocean.
+The biome is only placed if at least 3 of its neighbors are ocean and only with the specified chance. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenAddToOcean:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int UnderlyingSizeX = SizeX + 2;
+	static const int UnderlyingSizeZ = SizeZ + 2;
+
+public:
+	typedef std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>> Underlying;
+
+
+	cIntGenAddToOcean(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data:
+		int Cache[UnderlyingSizeX * UnderlyingSizeZ];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, Cache);
+
+		// Add the mushroom islands:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int val = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					a_Values[x + z * SizeX] = val;
+					continue;
+				}
+
+				// Count the ocean neighbors:
+				int Above = Cache[x + 1 + z * UnderlyingSizeX];
+				int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
+				int Left  = Cache[x +     (z + 1) * UnderlyingSizeX];
+				int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
+				int NumOceanNeighbors = 0;
+				if (IsBiomeOcean(Above))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Below))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Left))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Right))
+				{
+					NumOceanNeighbors += 1;
+				}
+
+				// If at least 3 ocean neighbors and the chance is right, change:
+				if (
+					(NumOceanNeighbors >= 3) &&
+					((super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance)
+				)
+				{
+					a_Values[x + z * SizeX] = m_ToValue;
+				}
+				else
+				{
+					a_Values[x + z * SizeX] = val;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	/** Chance, in permille, of changing the biome. */
+	int m_Chance;
+
+	/** The value to change the ocean into. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Changes random pixels of the underlying data to the specified value. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenSetRandomly :
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+	cIntGenSetRandomly(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Change random pixels to bgOcean:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					a_Values[x + z * SizeX] = m_ToValue;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel. */
+	int m_Chance;
+
+	/** The value to which to set the pixel. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+
+/** Adds a "rare" flag to random biome groups, based on the given chance. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenRareBiomeGroups:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenRareBiomeGroups(int a_Seed, int a_Chance, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+
+		// Change some of the biome groups into rare biome groups:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					int idx = x + SizeX * z;
+					a_Values[idx] = a_Values[idx] | bgfRare;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel into the rare biome group. */
+	int m_Chance;
+
+	/** The underlying generator. */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Changes biomes in the parent data into an alternate versions (usually "hill" variants), in such places
+that have their alterations set. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenAlternateBiomes:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenAlternateBiomes(int a_Seed, Underlying a_Alterations, Underlying a_BaseBiomes):
+		super(a_Seed),
+		m_Alterations(a_Alterations),
+		m_BaseBiomes(a_BaseBiomes)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the base biomes and the alterations:
+		m_BaseBiomes->GetInts(a_MinX, a_MinZ, a_Values);
+		typename super::Values alterations;
+		m_Alterations->GetInts(a_MinX, a_MinZ, alterations);
+
+		// Change the biomes into their alternate versions:
+		for (int idx = 0; idx < SizeX * SizeZ; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				// No change
+				continue;
+			}
+
+			// Change to alternate biomes:
+			int val = a_Values[idx];
+			switch (val)
+			{
+				case biBirchForest:   val = biBirchForestHills; break;
+				case biDesert:        val = biDesertHills;      break;
+				case biExtremeHills:  val = biExtremeHillsPlus; break;
+				case biForest:        val = biForestHills;      break;
+				case biIcePlains:     val = biIceMountains;     break;
+				case biJungle:        val = biJungleHills;      break;
+				case biMegaTaiga:     val = biMegaTaigaHills;   break;
+				case biMesaPlateau:   val = biMesa;             break;
+				case biMesaPlateauF:  val = biMesa;             break;
+				case biMesaPlateauM:  val = biMesa;             break;
+				case biMesaPlateauFM: val = biMesa;             break;
+				case biPlains:        val = biForest;           break;
+				case biRoofedForest:  val = biPlains;           break;
+				case biSavanna:       val = biSavannaPlateau;   break;
+				case biTaiga:         val = biTaigaHills;       break;
+			}
+			a_Values[idx] = val;
+		}  // for idx - a_Values[]
+	}
+
+protected:
+	Underlying m_Alterations;
+	Underlying m_BaseBiomes;
+};
+
+
+
+
+
+/** Adds an edge between two specifically incompatible biomes, such as mesa and forest. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenBiomeEdges:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+	static const int m_LowerSizeX = SizeX + 2;
+	static const int m_LowerSizeZ = SizeZ + 2;
+
+public:
+	typedef std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>> Underlying;
+
+
+	cIntGenBiomeEdges(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying biomes:
+		typename Underlying::element_type::Values lowerValues;
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerValues);
+
+		// Convert incompatible edges into neutral biomes:
+		for (int z = 0; z < SizeZ; z++)
+		{
+			for (int x = 0; x < SizeX; x++)
+			{
+				int biome = lowerValues[x + 1 + (z + 1) * m_LowerSizeX];
+				int above = lowerValues[x + 1 + z *       m_LowerSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * m_LowerSizeX];
+				int left  = lowerValues[x +     (z + 1) * m_LowerSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * m_LowerSizeX];
+
+				switch (biome)
+				{
+					case biDesert:
+					case biDesertM:
+					case biDesertHills:
+					{
+						if (
+							IsBiomeVeryCold(static_cast<EMCSBiome>(above)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(below)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(left))  ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // case biDesert
+
+					case biMesaPlateau:
+					case biMesaPlateauF:
+					case biMesaPlateauFM:
+					case biMesaPlateauM:
+					{
+						if (
+							!isMesaCompatible(above) ||
+							!isMesaCompatible(below) ||
+							!isMesaCompatible(left)  ||
+							!isMesaCompatible(right)
+						)
+						{
+							biome = biDesert;
+						}
+						break;
+					}  // Mesa biomes
+
+					case biJungle:
+					case biJungleM:
+					{
+						if (
+							!isJungleCompatible(above) ||
+							!isJungleCompatible(below) ||
+							!isJungleCompatible(left)  ||
+							!isJungleCompatible(right)
+						)
+						{
+							biome = (biome == biJungle) ? biJungleEdge : biJungleEdgeM;
+						}
+						break;
+					}  // Jungle biomes
+
+					case biSwampland:
+					case biSwamplandM:
+					{
+						if (
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(above)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(below)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(left))  ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // Swampland biomes
+				}  // switch (biome)
+
+				a_Values[x + z * SizeX] = biome;
+			}  // for x
+		}  // for z
+	}
+
+
+protected:
+	Underlying m_Underlying;
+
+
+	bool isMesaCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biDesert:
+			case biMesa:
+			case biMesaBryce:
+			case biMesaPlateau:
+			case biMesaPlateauF:
+			case biMesaPlateauFM:
+			case biMesaPlateauM:
+			case biOcean:
+			case biDeepOcean:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+
+
+	bool isJungleCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biJungle:
+			case biJungleM:
+			case biJungleEdge:
+			case biJungleEdgeM:
+			case biJungleHills:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+};
+
+
+
+
+
+/** Changes biomes in the parent data into their alternate versions ("M" variants), in such places that
+have their alterations set. */
+template <int SizeX, int SizeZ = SizeX>
+class cIntGenMBiomes:
+	public cIntGenWithNoise<SizeX, SizeZ>
+{
+	typedef cIntGenWithNoise<SizeX, SizeZ> super;
+
+public:
+	typedef std::shared_ptr<cIntGen<SizeX, SizeZ>> Underlying;
+
+
+	cIntGenMBiomes(int a_Seed, Underlying a_Alteration, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying),
+		m_Alteration(a_Alteration)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, typename super::Values & a_Values) override
+	{
+		// Generate the underlying biomes and the alterations:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_Values);
+		typename super::Values alterations;
+		m_Alteration->GetInts(a_MinX, a_MinZ, alterations);
+
+		// Wherever alterations are nonzero, change into alternate biome, if available:
+		for (int idx = 0; idx < SizeX * SizeZ; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				continue;
+			}
+
+			// Ice spikes biome was removed from here, because it was generated way too often
+			switch (a_Values[idx])
+			{
+				case biPlains:               a_Values[idx] = biSunflowerPlains;      break;
+				case biDesert:               a_Values[idx] = biDesertM;              break;
+				case biExtremeHills:         a_Values[idx] = biExtremeHillsM;        break;
+				case biForest:               a_Values[idx] = biFlowerForest;         break;
+				case biTaiga:                a_Values[idx] = biTaigaM;               break;
+				case biSwampland:            a_Values[idx] = biSwamplandM;           break;
+				case biJungle:               a_Values[idx] = biJungleM;              break;
+				case biJungleEdge:           a_Values[idx] = biJungleEdgeM;          break;
+				case biBirchForest:          a_Values[idx] = biBirchForestM;         break;
+				case biBirchForestHills:     a_Values[idx] = biBirchForestHillsM;    break;
+				case biRoofedForest:         a_Values[idx] = biRoofedForestM;        break;
+				case biColdTaiga:            a_Values[idx] = biColdTaigaM;           break;
+				case biMegaSpruceTaiga:      a_Values[idx] = biMegaSpruceTaiga;      break;
+				case biMegaSpruceTaigaHills: a_Values[idx] = biMegaSpruceTaigaHills; break;
+				case biExtremeHillsPlus:     a_Values[idx] = biExtremeHillsPlusM;    break;
+				case biSavanna:              a_Values[idx] = biSavannaM;             break;
+				case biSavannaPlateau:       a_Values[idx] = biSavannaPlateauM;      break;
+				case biMesa:                 a_Values[idx] = biMesaBryce;            break;
+				case biMesaPlateauF:         a_Values[idx] = biMesaPlateauFM;        break;
+				case biMesaPlateau:          a_Values[idx] = biMesaBryce;            break;
+			}
+		}  // for idx - a_Values[] / alterations[]
+	}
+
+protected:
+	Underlying m_Underlying;
+	Underlying m_Alteration;
+};
+
+
+
+
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
new file mode 100644
index 000000000..73ed27096
--- /dev/null
+++ b/src/Generating/ProtIntGen.h
@@ -0,0 +1,1351 @@
+
+// ProtIntGen.h
+
+// Declares the prototyping integer generators - cProtIntGen class and its descendants
+
+/*
+These classes generate 2D arrays of integers that have various interpretations. The main purpose of these
+classes is to provide fast prototyping for cIntGen classes - unlike cIntGen classes, these are not
+template-based and so they take care of the underlying sizes automatically. This makes them easier to chain
+and re-chain, since the size parameters don't need to be adjusted after each such case. Their performance is,
+however, slightly worse, which is why we use cIntGen classes in the final generator.
+
+Because there is no SizeX / SizeZ template param, the generators would have to either alloc memory for each
+underlying generator's values, or use a maximum-size buffer. We chose the latter, to avoid memory allocation
+overhead; this however means that there's (an arbitrary) limit to the size of the generated data.
+*/
+
+
+
+
+
+#pragma once
+
+// We need the biome group constants defined there:
+#include "IntGen.h"
+
+
+
+
+
+/** Interface that all the generator classes provide. */
+class cProtIntGen
+{
+protected:
+	/** Maximum size of the generated area.
+	Adjust the constant if you need larger areas, these are just so that we can use fixed-size buffers. */
+	static const int m_BufferSize = 900;
+
+public:
+
+	/** Type of the generic interface used for storing links to the underlying generators. */
+	typedef std::shared_ptr<cProtIntGen> Underlying;
+
+
+	/** Force a virtual destructor in all descendants.
+	Descendants contain virtual functions and are referred to via pointer-to-base, so they need a virtual destructor. */
+	virtual ~cProtIntGen() {}
+
+	/** Generates the array of specified size into a_Values, based on given min coords. */
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) = 0;
+};
+
+
+
+
+
+/** Provides additional cNoise member and its helper functions. */
+class cProtIntGenWithNoise :
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenWithNoise(int a_Seed) :
+		m_Noise(a_Seed)
+	{
+	}
+
+protected:
+	cNoise m_Noise;
+
+	/** Chooses one of a_Val1 or a_Val2, based on m_Noise and the coordinates for querying the noise. */
+	int chooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		return ((rnd & 1) == 0) ? a_Val1 : a_Val2;
+	}
+
+	/** Chooses one of a_ValN, based on m_Noise and the coordinates for querying the noise. */
+	int chooseRandomOne(int a_RndX, int a_RndZ, int a_Val1, int a_Val2, int a_Val3, int a_Val4)
+	{
+		int rnd = m_Noise.IntNoise2DInt(a_RndX, a_RndZ) / 7;
+		switch (rnd % 4)
+		{
+			case 0:  return a_Val1;
+			case 1:  return a_Val2;
+			case 2:  return a_Val3;
+			default: return a_Val4;
+		}
+	}
+};
+
+
+
+
+
+
+/** Generates a 2D array of random integers in the specified range [0 .. Range). */
+class cProtIntGenChoice :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenChoice(int a_Seed, int a_Range) :
+		super(a_Seed),
+		m_Range(a_Range)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				a_Values[x + a_SizeX * z] = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7) % m_Range;
+			}
+		}  // for z
+	}
+
+protected:
+	int m_Range;
+};
+
+
+
+
+
+
+/** Decides between the ocean and landmass biomes.
+Has a threshold (in percent) of how much land, the larger the threshold, the more land.
+Generates 0 for ocean, biome group ID for landmass. */
+class cProtIntGenLandOcean :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenLandOcean(int a_Seed, int a_Threshold) :
+		super(a_Seed),
+		m_Threshold(a_Threshold)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int BaseZ = a_MinZ + z;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int rnd = (super::m_Noise.IntNoise2DInt(a_MinX + x, BaseZ) / 7);
+				a_Values[x + a_SizeX * z] = ((rnd % 100) < m_Threshold) ? ((rnd / 101) % bgLandOceanMax + 1) : 0;
+			}
+		}
+
+		// If the centerpoint of the world is within the area, set it to bgTemperate, always:
+		if ((a_MinX <= 0) && (a_MinZ <= 0) && (a_MinX + a_SizeX > 0) && (a_MinZ + a_SizeZ > 0))
+		{
+			a_Values[-a_MinX - a_MinZ * a_SizeX] = bgTemperate;
+		}
+	}
+
+protected:
+	int m_Threshold;
+};
+
+
+
+
+
+/** Zooms the underlying value array to twice the size. Uses random-neighbor for the pixels in-between.
+This means that the zoome out image is randomly distorted. Applying zoom several times provides all
+the distortion that the generators need. */
+class cProtIntGenZoom :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenZoom(int a_Seed, Underlying a_UnderlyingGen) :
+		super(a_Seed),
+		m_UnderlyingGen(a_UnderlyingGen)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Get the coords for the lower generator:
+		int lowerMinX = a_MinX >> 1;
+		int lowerMinZ = a_MinZ >> 1;
+		int lowerSizeX = a_SizeX / 2 + 2;
+		int lowerSizeZ = a_SizeZ / 2 + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		ASSERT(lowerSizeX > 0);
+		ASSERT(lowerSizeZ > 0);
+
+		// Generate the underlying data with half the resolution:
+		int lowerData[m_BufferSize];
+		m_UnderlyingGen->GetInts(lowerMinX, lowerMinZ, lowerSizeX, lowerSizeZ, lowerData);
+		const int lowStepX = (lowerSizeX - 1) * 2;
+		int cache[m_BufferSize];
+
+		// Discreet-interpolate the values into twice the size:
+		for (int z = 0; z < lowerSizeZ - 1; ++z)
+		{
+			int idx = (z * 2) * lowStepX;
+			int PrevZ0 = lowerData[z * lowerSizeX];
+			int PrevZ1 = lowerData[(z + 1) * lowerSizeX];
+
+			for (int x = 0; x < lowerSizeX - 1; ++x)
+			{
+				int ValX1Z0 = lowerData[x + 1 + z * lowerSizeX];
+				int ValX1Z1 = lowerData[x + 1 + (z + 1) * lowerSizeX];
+				int RndX = (x + lowerMinX) * 2;
+				int RndZ = (z + lowerMinZ) * 2;
+				cache[idx] = PrevZ0;
+				cache[idx + lowStepX] = super::chooseRandomOne(RndX, RndZ + 1, PrevZ0, PrevZ1);
+				cache[idx + 1]        = super::chooseRandomOne(RndX, RndZ - 1, PrevZ0, ValX1Z0);
+				cache[idx + 1 + lowStepX] = super::chooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
+				idx += 2;
+				PrevZ0 = ValX1Z0;
+				PrevZ1 = ValX1Z1;
+			}
+		}
+
+		// Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
+		for (int z = 0; z < a_SizeZ; ++z)
+		{
+			memcpy(a_Values + z * a_SizeX, cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), a_SizeX * sizeof(int));
+		}
+	}
+
+protected:
+	Underlying m_UnderlyingGen;
+};
+
+
+
+
+
+/** Smoothes out some artifacts generated by the zooming - mostly single-pixel values.
+Compares each pixel to its neighbors and if the neighbors are equal, changes the pixel to their value. */
+class cProtIntGenSmooth :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenSmooth(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying values:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerData[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerData);
+
+		// Smooth - for each square check if the surroundings are the same, if so, expand them diagonally.
+		// Also get rid of single-pixel irregularities (A-B-A):
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int NoiseZ = a_MinZ + z;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val   = lowerData[x + 1 + (z + 1) * lowerSizeX];
+				int above = lowerData[x + 1 +  z      * lowerSizeX];
+				int below = lowerData[x + 1 + (z + 2) * lowerSizeX];
+				int left  = lowerData[x     + (z + 1) * lowerSizeX];
+				int right = lowerData[x + 2 + (z + 1) * lowerSizeX];
+
+				if ((left == right) && (above == below))
+				{
+					if (((super::m_Noise.IntNoise2DInt(a_MinX + x, NoiseZ) / 7) % 2) == 0)
+					{
+						val = left;
+					}
+					else
+					{
+						val = above;
+					}
+				}
+				else
+				{
+					if (left == right)
+					{
+						val = left;
+					}
+
+					if (above == below)
+					{
+						val = above;
+					}
+				}
+
+				a_Values[x + z * a_SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Converts land biomes at the edge of an ocean into the respective beach biome. */
+class cProtIntGenBeaches :
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenBeaches(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Map for biome -> its beach:
+		static const int ToBeach[] =
+		{
+			/* biOcean            */ biOcean,
+			/* biPlains           */ biBeach,
+			/* biDesert           */ biBeach,
+			/* biExtremeHills     */ biStoneBeach,
+			/* biForest           */ biBeach,
+			/* biTaiga            */ biColdBeach,
+			/* biSwampland        */ biSwampland,
+			/* biRiver            */ biRiver,
+			/* biNether           */ biNether,
+			/* biEnd              */ biEnd,
+			/* biFrozenOcean      */ biColdBeach,
+			/* biFrozenRiver      */ biColdBeach,
+			/* biIcePlains        */ biColdBeach,
+			/* biIceMountains     */ biColdBeach,
+			/* biMushroomIsland   */ biMushroomShore,
+			/* biMushroomShore    */ biMushroomShore,
+			/* biBeach            */ biBeach,
+			/* biDesertHills      */ biBeach,
+			/* biForestHills      */ biBeach,
+			/* biTaigaHills       */ biColdBeach,
+			/* biExtremeHillsEdge */ biStoneBeach,
+			/* biJungle           */ biBeach,
+			/* biJungleHills      */ biBeach,
+			/* biJungleEdge       */ biBeach,
+			/* biDeepOcean        */ biOcean,
+			/* biStoneBeach       */ biStoneBeach,
+			/* biColdBeach        */ biColdBeach,
+			/* biBirchForest      */ biBeach,
+			/* biBirchForestHills */ biBeach,
+			/* biRoofedForest     */ biBeach,
+			/* biColdTaiga        */ biColdBeach,
+			/* biColdTaigaHills   */ biColdBeach,
+			/* biMegaTaiga        */ biStoneBeach,
+			/* biMegaTaigaHills   */ biStoneBeach,
+			/* biExtremeHillsPlus */ biStoneBeach,
+			/* biSavanna          */ biBeach,
+			/* biSavannaPlateau   */ biBeach,
+			/* biMesa             */ biMesa,
+			/* biMesaPlateauF     */ biMesa,
+			/* biMesaPlateau      */ biMesa,
+		};
+
+		// Generate the underlying values:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Add beaches between ocean and biomes:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val   = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				int above = lowerValues[x + 1 + z       * lowerSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int left  = lowerValues[x     + (z + 1) * lowerSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					if (IsBiomeOcean(above) || IsBiomeOcean(below) || IsBiomeOcean(left) || IsBiomeOcean(right))
+					{
+						// First convert the value to a regular biome (drop the M flag), then modulo by our biome count:
+						val = ToBeach[(val % 128) % ARRAYCOUNT(ToBeach)];
+					}
+				}
+				a_Values[x + z * a_SizeX] = val;
+			}
+		}
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Generates the underlying numbers and then randomly changes some ocean group pixels into random land
+biome group pixels, based on the predefined chance. */
+class cProtIntGenAddIslands :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	typedef std::shared_ptr<cProtIntGen> Underlying;
+
+
+	cProtIntGenAddIslands(int a_Seed, int a_Chance, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				if (a_Values[x + z * a_SizeX] == bgOcean)
+				{
+					int rnd = super::m_Noise.IntNoise2DInt(a_MinX + x, a_MinZ + z) / 7;
+					if (rnd % 1000 < m_Chance)
+					{
+						a_Values[x + z * a_SizeX] = (rnd / 1003) % bgLandOceanMax;
+					}
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance of each ocean pixel being converted, in permille. */
+	int m_Chance;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** A filter that adds an edge biome group between two biome groups that need an edge between them. */
+class cProtIntGenBiomeGroupEdges :
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenBiomeGroupEdges(Underlying a_Underlying) :
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values)
+	{
+		// Generate the underlying biome groups:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX, a_MinZ, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Change the biomes on incompatible edges into an edge biome:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val   = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				int Above = lowerValues[x + 1 + z       * lowerSizeX];
+				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerValues[x     + (z + 1) * lowerSizeX];
+				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				switch (val)
+				{
+					// Desert should neighbor only oceans, desert and temperates; change to temperate when another:
+					case bgDesert:
+					{
+						if (
+							!isDesertCompatible(Above) ||
+							!isDesertCompatible(Below) ||
+							!isDesertCompatible(Left) ||
+							!isDesertCompatible(Right)
+						)
+						{
+							val = bgTemperate;
+						}
+						break;
+					}  // case bgDesert
+
+					// Ice should not neighbor deserts; change to temperate:
+					case bgIce:
+					{
+						if (
+							(Above == bgDesert) ||
+							(Below == bgDesert) ||
+							(Left  == bgDesert) ||
+							(Right == bgDesert)
+						)
+						{
+							val = bgTemperate;
+						}
+						break;
+					}  // case bgIce
+				}
+				a_Values[x + z * a_SizeX] = val;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+
+
+	inline bool isDesertCompatible(int a_BiomeGroup)
+	{
+		switch (a_BiomeGroup)
+		{
+			case bgOcean:
+			case bgDesert:
+			case bgTemperate:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+};
+
+
+
+
+
+/** Turns biome group indices into real biomes.
+For each pixel, takes its biome group and chooses a random biome from that group; replaces the value with
+that biome. */
+class cProtIntGenBiomes :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenBiomes(int a_Seed, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Define the per-biome-group biomes:
+		static const int oceanBiomes[] =
+		{
+			biOcean,  // biDeepOcean,
+		};
+
+		// Same as oceanBiomes, there are no rare oceanic biomes (mushroom islands are handled separately)
+		static const int rareOceanBiomes[] =
+		{
+			biOcean,
+		};
+
+		static const int desertBiomes[] =
+		{
+			biDesert, biDesert, biDesert, biDesert, biDesert, biDesert, biSavanna, biSavanna, biPlains,
+		};
+
+		static const int rareDesertBiomes[] =
+		{
+			biMesaPlateau, biMesaPlateauF,
+		};
+
+		static const int temperateBiomes[] =
+		{
+			biForest, biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
+		};
+
+		static const int rareTemperateBiomes[] =
+		{
+			biJungle,  // Jungle is not strictly temperate, but let's piggyback it here
+		};
+
+		static const int mountainBiomes[] =
+		{
+			biExtremeHills, biForest, biTaiga, biPlains,
+		};
+
+		static const int rareMountainBiomes[] =
+		{
+			biMegaTaiga,
+		};
+
+		static const int iceBiomes[] =
+		{
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
+		};
+
+		// Same as iceBiomes, there's no rare ice biome
+		static const int rareIceBiomes[] =
+		{
+			biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
+		};
+
+		static const cBiomesInGroups biomesInGroups[] =
+		{
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(oceanBiomes)),     oceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(desertBiomes)),    desertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(mountainBiomes)),  mountainBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(iceBiomes)),       iceBiomes},
+		};
+
+		static const cBiomesInGroups rareBiomesInGroups[] =
+		{
+			/* bgOcean */     { static_cast<int>(ARRAYCOUNT(rareOceanBiomes)),     rareOceanBiomes},
+			/* bgDesert */    { static_cast<int>(ARRAYCOUNT(rareDesertBiomes)),    rareDesertBiomes},
+			/* bgTemperate */ { static_cast<int>(ARRAYCOUNT(rareTemperateBiomes)), rareTemperateBiomes},
+			/* bgMountains */ { static_cast<int>(ARRAYCOUNT(rareMountainBiomes)),  rareMountainBiomes},
+			/* bgIce */       { static_cast<int>(ARRAYCOUNT(rareIceBiomes)),       rareIceBiomes},
+		};
+
+		// Generate the underlying values, representing biome groups:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Overwrite each biome group with a random biome from that group:
+		// Take care of the bgfRare flag
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int IdxZ = z * a_SizeX;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val = a_Values[x + IdxZ];
+				const cBiomesInGroups & Biomes = (val > bgfRare) ?
+					rareBiomesInGroups[(val & (bgfRare - 1)) % ARRAYCOUNT(rareBiomesInGroups)] :
+					biomesInGroups[val % ARRAYCOUNT(biomesInGroups)];
+				int rnd = (super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
+				a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
+			}
+		}
+	}
+
+protected:
+
+	struct cBiomesInGroups
+	{
+		const int Count;
+		const int * Biomes;
+	};
+
+
+	/** The underlying int generator */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Randomly replaces pixels of one value to another value, using the given chance. */
+class cProtIntGenReplaceRandomly :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	typedef std::shared_ptr<cProtIntGen> Underlying;
+
+
+	cProtIntGenReplaceRandomly(int a_Seed, int a_From, int a_To, int a_Chance, Underlying a_Underlying) :
+		super(a_Seed),
+		m_From(a_From),
+		m_To(a_To),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying values:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Replace some of the values:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int idxZ = z * a_SizeX;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (a_Values[idx] == m_From)
+				{
+					int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+					if (rnd % 1000 < m_Chance)
+					{
+						a_Values[idx] = m_To;
+					}
+				}
+			}
+		}  // for z
+	}
+
+
+protected:
+	/** The original value to be replaced. */
+	int m_From;
+
+	/** The destination value to which to replace. */
+	int m_To;
+
+	/** Chance, in permille, of replacing the value. */
+	int m_Chance;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Mixer that joins together finalized biomes and rivers.
+It first checks for oceans, if there is an ocean in the Biomes, it keeps the ocean.
+If there's no ocean, it checks Rivers for a river, if there is a river, it uses the Biomes to select either
+regular river or frozen river, based on the biome. */
+class cProtIntGenMixRivers:
+	public cProtIntGen
+{
+	typedef cProtIntGen super;
+
+public:
+	cProtIntGenMixRivers(Underlying a_Biomes, Underlying a_Rivers):
+		m_Biomes(a_Biomes),
+		m_Rivers(a_Rivers)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		ASSERT(a_SizeX * a_SizeZ <= m_BufferSize);
+		m_Biomes->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		int riverData[m_BufferSize];
+		m_Rivers->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, riverData);
+
+		// Mix the values:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			int idxZ = z * a_SizeX;
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int idx = x + idxZ;
+				if (IsBiomeOcean(a_Values[idx]))
+				{
+					// Oceans are kept without any changes
+					continue;
+				}
+				if (riverData[idx] != biRiver)
+				{
+					// There's no river, keep the current value
+					continue;
+				}
+
+				// There's a river, change the output to a river or a frozen river, based on the original biome:
+				if (IsBiomeVeryCold((EMCSBiome)a_Values[idx]))
+				{
+					a_Values[idx] = biFrozenRiver;
+				}
+				else
+				{
+					a_Values[idx] = biRiver;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Biomes;
+	Underlying m_Rivers;
+};
+
+
+
+
+
+/** Generates a river based on the underlying data.
+This is basically an edge detector over the underlying data. The rivers are the edges where the underlying
+data changes from one pixel to its neighbor. */
+class cProtIntGenRiver:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenRiver(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Detect the edges:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int Above = lowerValues[x + 1 + z       * lowerSizeX];
+				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerValues[x +     (z + 1) * lowerSizeX];
+				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				int val   = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+
+				if ((val == Above) && (val == Below) && (val == Left) && (val == Right))
+				{
+					val = 0;
+				}
+				else
+				{
+					val = biRiver;
+				}
+				a_Values[x + z * a_SizeX] = val;
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Turns some of the oceans into the specified biome. Used for mushroom and deep ocean.
+The biome is only placed if at least 3 of its neighbors are ocean and only with the specified chance. */
+class cProtIntGenAddToOcean:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenAddToOcean(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Add the mushroom islands:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int val = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				if (!IsBiomeOcean(val))
+				{
+					a_Values[x + z * a_SizeX] = val;
+					continue;
+				}
+
+				// Count the ocean neighbors:
+				int Above = lowerValues[x + 1 + z       * lowerSizeX];
+				int Below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int Left  = lowerValues[x +     (z + 1) * lowerSizeX];
+				int Right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+				int NumOceanNeighbors = 0;
+				if (IsBiomeOcean(Above))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Below))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Left))
+				{
+					NumOceanNeighbors += 1;
+				}
+				if (IsBiomeOcean(Right))
+				{
+					NumOceanNeighbors += 1;
+				}
+
+				// If at least 3 ocean neighbors and the chance is right, change:
+				if (
+					(NumOceanNeighbors >= 3) &&
+					((super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance)
+				)
+				{
+					a_Values[x + z * a_SizeX] = m_ToValue;
+				}
+				else
+				{
+					a_Values[x + z * a_SizeX] = val;
+				}
+			}  // for x
+		}  // for z
+	}
+
+protected:
+	/** Chance, in permille, of changing the biome. */
+	int m_Chance;
+
+	/** The value to change the ocean into. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Changes random pixels of the underlying data to the specified value. */
+class cProtIntGenSetRandomly :
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenSetRandomly(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying) :
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_ToValue(a_ToValue),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Change random pixels to bgOcean:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					a_Values[x + z * a_SizeX] = m_ToValue;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel. */
+	int m_Chance;
+
+	/** The value to which to set the pixel. */
+	int m_ToValue;
+
+	Underlying m_Underlying;
+};
+
+
+
+
+
+
+/** Adds a "rare" flag to random biome groups, based on the given chance. */
+class cProtIntGenRareBiomeGroups:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenRareBiomeGroups(int a_Seed, int a_Chance, Underlying a_Underlying):
+		super(a_Seed),
+		m_Chance(a_Chance),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying data:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+
+		// Change some of the biome groups into rare biome groups:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int rnd = super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7;
+				if (rnd % 1000 < m_Chance)
+				{
+					int idx = x + a_SizeX * z;
+					a_Values[idx] = a_Values[idx] | bgfRare;
+				}
+			}
+		}
+	}
+
+protected:
+	/** Chance, in permille, of changing each pixel into the rare biome group. */
+	int m_Chance;
+
+	/** The underlying generator. */
+	Underlying m_Underlying;
+};
+
+
+
+
+
+/** Changes biomes in the parent data into an alternate versions (usually "hill" variants), in such places
+that have their alterations set. */
+class cProtIntGenAlternateBiomes:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenAlternateBiomes(int a_Seed, Underlying a_Alterations, Underlying a_BaseBiomes):
+		super(a_Seed),
+		m_Alterations(a_Alterations),
+		m_BaseBiomes(a_BaseBiomes)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the base biomes and the alterations:
+		m_BaseBiomes->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		int alterations[m_BufferSize];
+		m_Alterations->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, alterations);
+
+		// Change the biomes into their alternate versions:
+		int len = a_SizeX * a_SizeZ;
+		for (int idx = 0; idx < len; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				// No change
+				continue;
+			}
+
+			// Change to alternate biomes:
+			int val = a_Values[idx];
+			switch (val)
+			{
+				case biBirchForest:   val = biBirchForestHills; break;
+				case biDesert:        val = biDesertHills;      break;
+				case biExtremeHills:  val = biExtremeHillsPlus; break;
+				case biForest:        val = biForestHills;      break;
+				case biIcePlains:     val = biIceMountains;     break;
+				case biJungle:        val = biJungleHills;      break;
+				case biMegaTaiga:     val = biMegaTaigaHills;   break;
+				case biMesaPlateau:   val = biMesa;             break;
+				case biMesaPlateauF:  val = biMesa;             break;
+				case biMesaPlateauM:  val = biMesa;             break;
+				case biMesaPlateauFM: val = biMesa;             break;
+				case biPlains:        val = biForest;           break;
+				case biRoofedForest:  val = biPlains;           break;
+				case biSavanna:       val = biSavannaPlateau;   break;
+				case biTaiga:         val = biTaigaHills;       break;
+			}
+			a_Values[idx] = val;
+		}  // for idx - a_Values[]
+	}
+
+protected:
+	Underlying m_Alterations;
+	Underlying m_BaseBiomes;
+};
+
+
+
+
+
+/** Adds an edge between two specifically incompatible biomes, such as mesa and forest. */
+class cProtIntGenBiomeEdges:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenBiomeEdges(int a_Seed, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying biomes:
+		int lowerSizeX = a_SizeX + 2;
+		int lowerSizeZ = a_SizeZ + 2;
+		ASSERT(lowerSizeX * lowerSizeZ <= m_BufferSize);
+		int lowerValues[m_BufferSize];
+		m_Underlying->GetInts(a_MinX - 1, a_MinZ - 1, lowerSizeX, lowerSizeZ, lowerValues);
+
+		// Convert incompatible edges into neutral biomes:
+		for (int z = 0; z < a_SizeZ; z++)
+		{
+			for (int x = 0; x < a_SizeX; x++)
+			{
+				int biome = lowerValues[x + 1 + (z + 1) * lowerSizeX];
+				int above = lowerValues[x + 1 + z *       lowerSizeX];
+				int below = lowerValues[x + 1 + (z + 2) * lowerSizeX];
+				int left  = lowerValues[x +     (z + 1) * lowerSizeX];
+				int right = lowerValues[x + 2 + (z + 1) * lowerSizeX];
+
+				switch (biome)
+				{
+					case biDesert:
+					case biDesertM:
+					case biDesertHills:
+					{
+						if (
+							IsBiomeVeryCold(static_cast<EMCSBiome>(above)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(below)) ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(left))  ||
+							IsBiomeVeryCold(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // case biDesert
+
+					case biMesaPlateau:
+					case biMesaPlateauF:
+					case biMesaPlateauFM:
+					case biMesaPlateauM:
+					{
+						if (
+							!isMesaCompatible(above) ||
+							!isMesaCompatible(below) ||
+							!isMesaCompatible(left)  ||
+							!isMesaCompatible(right)
+						)
+						{
+							biome = biDesert;
+						}
+						break;
+					}  // Mesa biomes
+
+					case biJungle:
+					case biJungleM:
+					{
+						if (
+							!isJungleCompatible(above) ||
+							!isJungleCompatible(below) ||
+							!isJungleCompatible(left)  ||
+							!isJungleCompatible(right)
+						)
+						{
+							biome = (biome == biJungle) ? biJungleEdge : biJungleEdgeM;
+						}
+						break;
+					}  // Jungle biomes
+
+					case biSwampland:
+					case biSwamplandM:
+					{
+						if (
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(above)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(below)) ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(left))  ||
+							IsBiomeNoDownfall(static_cast<EMCSBiome>(right))
+						)
+						{
+							biome = biPlains;
+						}
+						break;
+					}  // Swampland biomes
+				}  // switch (biome)
+
+				a_Values[x + z * a_SizeX] = biome;
+			}  // for x
+		}  // for z
+	}
+
+
+protected:
+	Underlying m_Underlying;
+
+
+	bool isMesaCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biDesert:
+			case biMesa:
+			case biMesaBryce:
+			case biMesaPlateau:
+			case biMesaPlateauF:
+			case biMesaPlateauFM:
+			case biMesaPlateauM:
+			case biOcean:
+			case biDeepOcean:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+
+
+	bool isJungleCompatible(int a_Biome)
+	{
+		switch (a_Biome)
+		{
+			case biJungle:
+			case biJungleM:
+			case biJungleEdge:
+			case biJungleEdgeM:
+			case biJungleHills:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
+	}
+};
+
+
+
+
+
+/** Changes biomes in the parent data into their alternate versions ("M" variants), in such places that
+have their alterations set. */
+class cProtIntGenMBiomes:
+	public cProtIntGenWithNoise
+{
+	typedef cProtIntGenWithNoise super;
+
+public:
+	cProtIntGenMBiomes(int a_Seed, Underlying a_Alteration, Underlying a_Underlying):
+		super(a_Seed),
+		m_Underlying(a_Underlying),
+		m_Alteration(a_Alteration)
+	{
+	}
+
+
+	virtual void GetInts(int a_MinX, int a_MinZ, int a_SizeX, int a_SizeZ, int * a_Values) override
+	{
+		// Generate the underlying biomes and the alterations:
+		m_Underlying->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, a_Values);
+		int alterations[m_BufferSize];
+		m_Alteration->GetInts(a_MinX, a_MinZ, a_SizeX, a_SizeZ, alterations);
+
+		// Wherever alterations are nonzero, change into alternate biome, if available:
+		int len = a_SizeX * a_SizeZ;
+		for (int idx = 0; idx < len; ++idx)
+		{
+			if (alterations[idx] == 0)
+			{
+				continue;
+			}
+
+			// Ice spikes biome was removed from here, because it was generated way too often
+			switch (a_Values[idx])
+			{
+				case biPlains:               a_Values[idx] = biSunflowerPlains;      break;
+				case biDesert:               a_Values[idx] = biDesertM;              break;
+				case biExtremeHills:         a_Values[idx] = biExtremeHillsM;        break;
+				case biForest:               a_Values[idx] = biFlowerForest;         break;
+				case biTaiga:                a_Values[idx] = biTaigaM;               break;
+				case biSwampland:            a_Values[idx] = biSwamplandM;           break;
+				case biJungle:               a_Values[idx] = biJungleM;              break;
+				case biJungleEdge:           a_Values[idx] = biJungleEdgeM;          break;
+				case biBirchForest:          a_Values[idx] = biBirchForestM;         break;
+				case biBirchForestHills:     a_Values[idx] = biBirchForestHillsM;    break;
+				case biRoofedForest:         a_Values[idx] = biRoofedForestM;        break;
+				case biColdTaiga:            a_Values[idx] = biColdTaigaM;           break;
+				case biMegaSpruceTaiga:      a_Values[idx] = biMegaSpruceTaiga;      break;
+				case biMegaSpruceTaigaHills: a_Values[idx] = biMegaSpruceTaigaHills; break;
+				case biExtremeHillsPlus:     a_Values[idx] = biExtremeHillsPlusM;    break;
+				case biSavanna:              a_Values[idx] = biSavannaM;             break;
+				case biSavannaPlateau:       a_Values[idx] = biSavannaPlateauM;      break;
+				case biMesa:                 a_Values[idx] = biMesaBryce;            break;
+				case biMesaPlateauF:         a_Values[idx] = biMesaPlateauFM;        break;
+				case biMesaPlateau:          a_Values[idx] = biMesaBryce;            break;
+			}
+		}  // for idx - a_Values[] / alterations[]
+	}
+
+protected:
+	Underlying m_Underlying;
+	Underlying m_Alteration;
+};
+
+
+
+
diff --git a/src/IniFile.cpp b/src/IniFile.cpp
index a666a4ff8..ded7e4199 100644
--- a/src/IniFile.cpp
+++ b/src/IniFile.cpp
@@ -9,7 +9,7 @@
 // Email:        Shane.Hill@dsto.defence.gov.au
 // Reason:       Remove dependancy on MFC. Code should compile on any
 //               platform.
-//////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 /*
 !! MODIFIED BY FAKETRUTH and xoft !!
@@ -79,7 +79,7 @@ bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect)
 		}
 	}
 
-	bool IsFirstLine = true;  
+	bool IsFirstLine = true;
 
 	while (getline(f, line))
 	{
@@ -866,7 +866,7 @@ AString cIniFile::CheckCase(const AString & s) const
 
 void cIniFile::RemoveBom(AString & a_line) const
 {
-	// The BOM sequence for UTF-8 is 0xEF,0xBB,0xBF
+	// The BOM sequence for UTF-8 is 0xEF, 0xBB, 0xBF
 	static unsigned const char BOM[] = { 0xEF, 0xBB, 0xBF };
 
 	// The BOM sequence, if present, is always th e first three characters of the input.
diff --git a/src/IniFile.h b/src/IniFile.h
index 3f704551f..e5879f46c 100644
--- a/src/IniFile.h
+++ b/src/IniFile.h
@@ -9,7 +9,7 @@
 // Email:        Shane.Hill@dsto.defence.gov.au
 // Reason:       Remove dependancy on MFC. Code should compile on any
 //               platform. Tested on Windows/Linux/Irix
-//////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 /*
 !! MODIFIED BY FAKETRUTH and madmaxoft!!
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index d85a5c329..4daa8cc7b 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -604,6 +604,28 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
 				m_Writer.AddByte("IsConverting", (((const cZombie *)a_Monster)->IsConverting() ? 1 : 0));
 				break;
 			}
+			case mtInvalidType:
+			case mtBlaze:
+			case mtCaveSpider:
+			case mtChicken:
+			case mtCow:
+			case mtEnderDragon:
+			case mtGhast:
+			case mtGiant:
+			case mtIronGolem:
+			case mtMooshroom:
+			case mtOcelot:
+			case mtPig:
+			case mtSilverfish:
+			case mtSnowGolem:
+			case mtSpider:
+			case mtSquid:
+			case mtWitch:
+			case mtZombiePigman:
+			{
+				// Other mobs have no special tags.
+				break;
+			}
 		}
 	m_Writer.EndCompound();
 }
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index af7551ee4..0c77b4d67 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -696,11 +696,28 @@ cBlockEntity * cWSSAnvil::LoadBlockEntityFromNBT(const cParsedNBT & a_NBT, int a
 bool cWSSAnvil::LoadItemFromNBT(cItem & a_Item, const cParsedNBT & a_NBT, int a_TagIdx)
 {
 	int Type = a_NBT.FindChildByName(a_TagIdx, "id");
-	if ((Type < 0) || (a_NBT.GetType(Type) != TAG_Short))
+	if (Type <= 0)
 	{
 		return false;
 	}
-	a_Item.m_ItemType = a_NBT.GetShort(Type);
+
+	if (a_NBT.GetType(Type) == TAG_String)
+	{
+		if (!StringToItem(a_NBT.GetString(Type), a_Item))
+		{
+			// Can't resolve item type
+			return false;
+		}
+	}
+	else if (a_NBT.GetType(Type) == TAG_Short)
+	{
+		a_Item.m_ItemType = a_NBT.GetShort(Type);
+	}
+	else
+	{
+		return false;
+	}
+
 	if (a_Item.m_ItemType < 0)
 	{
 		a_Item.Empty();