Blacksmith feature start
Merge branch 'master' into Feature-Blacksmithing

Conflicts:
	src/main/java/teamUnknown/immersion/Immersion.java
	src/main/java/teamUnknown/immersion/core/blocks/ImmersionBlock.java
	src/main/java/teamUnknown/immersion/core/repositories/FeatureRepository.java
	src/main/java/teamUnknown/immersion/features/common/FeatureContext.java
	src/main/java/teamUnknown/immersion/features/spawnFeature/SpawnFeature.java
Merge branch 'master' into Feature-Blacksmithing -> this feature s now using the new feature system
Quick cleanup run, implementation of ObjectReg

deleted out/production
Implementation of ObjectReg for Feature Blacksmithing
Hotfix to account for new registration protocols
Change to ImmersionBlock to account for registration changes.
Quick hotfix to Immersion Item
Merge pull request #9 from Mc-Immersion/Feature-Blacksmithing

Feature blacksmithing
Merge remote-tracking branch 'origin/master' into Base-Ore-Gen

Conflicts:
	src/main/java/teamUnknown/immersion/Immersion.java