fixed 2 entries of 'grass' in block menu

Signed-off-by: andrewphorn <andrewphorn@gmail.com>
Merge branch 'master' of https://github.com/andrewphorn/ClassiCube-Client

Conflicts:
	src/main/java/com/mojang/minecraft/SessionData.java
when in doubt, comment out