Calclavia f4d95a8129 Merge branch 'master' into universal-wires		2013-12-01 13:54:34 +08:00
..
api	fixed API once again! :)	2013-12-01 00:15:52 -05:00
client	Re-add EnumColor to API!	2013-12-01 00:03:40 -05:00
common	Fixed OreDict integration	2013-12-01 00:29:08 -05:00
generators	Re-add EnumColor to API!	2013-12-01 00:03:40 -05:00
induction	Made vanilla electric furnace load when Mekanism Generators is not loaded	2013-12-01 13:54:05 +08:00
tools	Some work on things, got rid of version constants, they're supposed to differ per module.	2013-11-20 11:01:13 -05:00