GenProject/Genesis — pull request #2 by ShanTengTu (2014-12-20 19:04:42+00:00)
Title: Merge last changes of 1.7.10 into 1.8.Resolve conflicts using 1.7.10 version.

last changes of 1.7.10 as below:
-Added Box / Campfire break time and their effective tool.
-Removed Hausmannia plant.
-Now Polissoir drop one granite when recovered with pickaxe.
-Added 2 item : Tyrannosaurus Saliva & Stromatolite Biofilm.
-Renamed texture file "Eryops" to "eryops".
-Removed texture file "normal_box2" and "normal_double_box2".

Conflicts:
src/main/java/genesis/block/tiles/BlockCampfire.java
src/main/java/genesis/block/tiles/BlockPolissoir.java
src/main/java/genesis/block/tiles/BlockStorageBox.java
src/main/java/genesis/lib/Names.java
src/main/java/genesis/managers/GenesisModItems.java
src/main/resources/assets/genesis/lang/en_US.lang
src/main/resources/assets/genesis/lang/fr_FR.lang
src/main/resources/assets/genesis/lang/pt_BR.lang
src/main/resources/assets/genesis/lang/zh_TW.lang