Try to reconcile edits
Merge branch 'master' of https://github.com/ReikaKalseki/RotaryCraft

Conflicts:
	Registry/MachineRegistry.java
	RotaryNames.java