Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

This commit is contained in:
Florian Nücke 2015-04-05 21:02:16 +02:00
commit 542f1cb24f

View File

@ -215,8 +215,8 @@ oc:container.Switch=Switch
oc:container.TabletWrapper=Tablet
# Keybinds
key.materialCosts=Show Material Costs
key.clipboardPaste=Paste Clipboard
key.materialCosts=Show Material Costs
# Item / Block Tooltips
oc:tooltip.AccessPoint=Acts like a Switch, but additionally receives wireless packets and relays wired packets wirelessly.