Calclavia 07332ca245 Merge branch 'master' into universal-wires ... Conflicts: common/mekanism/induction/common/MekanismInduction.java resources/assets/mekanism/lang/en_US.lang		2013-12-02 19:47:38 +08:00
..
api	fixed API once again! :)	2013-12-01 00:15:52 -05:00
client	Fixed teslas, merged Electrostatic Linker into Configurator	2013-12-01 14:03:00 -05:00
common	Begin work on copper and tin ore and ingots :)	2013-12-01 21:58:35 -05:00
generators	Re-add EnumColor to API!	2013-12-01 00:03:40 -05:00
induction	Merge branch 'master' into universal-wires	2013-12-02 19:47:38 +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