Merge branch 'patch-1' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10

This commit is contained in:
Florian Nücke 2015-04-19 11:32:07 +02:00
commit dd975cc034

View File

@ -69,8 +69,8 @@ item.oc.GraphicsCard2.name=Graphics Card (Tier 3)
item.oc.HardDiskDrive0.name=Hard Disk Drive (Tier 1)
item.oc.HardDiskDrive1.name=Hard Disk Drive (Tier 2)
item.oc.HardDiskDrive2.name=Hard Disk Drive (Tier 3)
item.oc.InkCartridge.name=Ink Cartidge
item.oc.InkCartridgeEmpty.name=Ink Cartidge (Empty)
item.oc.InkCartridge.name=Ink Cartridge
item.oc.InkCartridgeEmpty.name=Ink Cartridge (Empty)
item.oc.InternetCard.name=Internet Card
item.oc.Interweb.name=Interweb
item.oc.IronNugget.name=Iron Nugget
@ -425,4 +425,4 @@ nei.usage.oc.Manual=Open Manual
# Waila Integration
option.oc.address=Address
option.oc.componentName=Component Name
option.oc.energy=Energy
option.oc.energy=Energy