WayofTime 428a618eaf Merge pull request #119 from joshiejack/master ... MT3 Support. And some NEI Adjustments.		2014-10-16 07:22:53 -04:00
..
java/WayofTime/alchemicalWizardry	Fix @WayofTime using the shaped/shapeless in the joshie folder, when he should be using the ones in the api folder.	2014-10-16 05:27:37 +01:00
resources	Merge pull request #114 from Adaptivity/Update	2014-10-16 07:20:26 -04:00