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
..
credits.md	reduced the difference between IC2's wires and IndustrialWires's cables to prevent machines from blowing up when they shouldn't	2017-01-04 18:31:56 +01:00
en_US.lang	Cleaned up a merge conflict in en_US.lang	2017-06-16 09:47:19 +02:00
zh_CN.lang	General refactoring, IC2 connectors no longer use BlockIEBase!	2017-03-21 18:12:09 +01:00