did some stuff
Merge branch 'master' of https://github.com/nedhyett/ElementalCraft

Conflicts:
	src/nedhyett/elementalcraft/core/ElementalCraftRecipes.java
	src/nedhyett/elementalcraft/core/registries/ElementalCraftBlocks.java
	src/nedhyett/elementalcraft/core/registries/ElementalCraftEntities.java
idk