Aidan C. Brady 16c5f7cdb3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development		2014-07-10 16:25:04 -04:00
..
api/java	Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces.	2014-07-10 16:53:01 +01:00
main	Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development	2014-07-10 16:25:04 -04:00