Ben Spiers a0c492862f Merge branch 'master' into development ... Conflicts: src/main/java/mekanism/common/multipart/ItemGlowPanel.java		2014-11-11 12:37:57 +00:00
..
api/java	Update lots of APIs, most notably BC and an actual 1.7 version of CC	2014-11-10 21:51:37 +00:00
main	Merge branch 'master' into development	2014-11-11 12:37:57 +00:00