Moved from JBuk/NumiRP
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	common/num/numirp/recipe/ModCrafting.java
Final merge :)
Merge pull request #2 from JBukCZ/master

Tools by JBuk