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
..
java/malte0811/industrialWires	Minor fixes to the previous commits	2017-05-26 17:02:07 +02:00
resources	Cleaned up a merge conflict in en_US.lang	2017-06-16 09:47:19 +02:00