twerks
Merge branch 'master' of github.com:/OpenMods/OpenBlocks
messing with golden egg stuff still
Merge branch 'master' of github.com:/OpenMods/OpenBlocks into open-mods-core

Conflicts:
	src/openblocks/common/entity/EntityBlock.java
	src/openblocks/common/tileentity/TileEntityGoldenEgg.java