Merge pull request #23 from Ephys/master

update master to 1.7 from Ephys
Update TSContent.java

adding charcoal block
Update TSContent.java

removing extra params
Update TSContent.java

reverting, not needed anymore
Update TSRecipes.java

replacing the block of charcoal fuel registry to use the OreDictionary for issue Ephys#33
Merge pull request #42 from wisthy/master

OreDictionary for FuelHandling of ChacoalBlock