IndustrialWires/src/main/resources/assets/industrialwires/lang
malte0811 55e03ab8a4 Started adding locks for panels
# Conflicts:
#	src/main/java/malte0811/industrialWires/CommonProxy.java
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/client/ClientProxy.java
#	src/main/java/malte0811/industrialWires/containers/ContainerPanelComponent.java
#	src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java
#	src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java
#	src/main/java/malte0811/industrialWires/network/MessageComponentSync.java
2017-05-26 13:25:16 +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 Started adding locks for panels 2017-05-26 13:25:16 +02:00
zh_CN.lang General refactoring, IC2 connectors no longer use BlockIEBase! 2017-03-21 18:12:09 +01:00