Merge branch 'master' into portals

Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp

src/BlockID.h

@@ -790,6 +790,7 @@ enum eDimension
 	dimNether    = -1,
 	dimOverworld = 0,
 	dimEnd       = 1,
+	dimNotSet    = 255,  // For things that need an "indeterminate" state, such as cProtocol's LastSentDimension
 } ;