Commit graph

3 commits

Author SHA1 Message Date
Calclavia
b7a5eee223 Version Bump 2013-08-05 21:16:53 -04:00
Calclavia
cafd17a9ac Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
Conflicts:
	src/resonantinduction/battery/TileEntityBattery.java
2013-08-05 13:02:31 -04:00
Calclavia
de2881ef84 Added build script 2013-08-01 20:20:14 -04:00