malte0811 56f9852acc Cleaned up a merge conflict in en_US.lang ... Wasn't there some sort of joke about programming languages where merge conflicts are still valid code?		2017-06-16 09:47:19 +02:00
..
assets/industrialwires	Cleaned up a merge conflict in en_US.lang	2017-06-16 09:47:19 +02:00
META-INF	Started implementing a GUI for creating control panels	2017-04-12 15:55:37 +02:00
mcmod.info	added a license: GPL3	2016-09-29 16:26:03 +02:00