Minor Changes
Worked on power Net
Merge branch 'origin/master'

Conflicts:
	electro/handlers/Crafting.java
	electro/handlers/IDHandler.java