Merge branch 'master-MC1.7.10' into master-MC1.10

This commit is contained in:
payonel 2019-08-19 23:26:23 -07:00
commit e7d7855142

View File

@ -47,8 +47,8 @@ item.oc.AbstractBusCard.name=Abstract Bus Card
item.oc.Acid.name=Grog
item.oc.ALU.name=Arithmetic Logic Unit (ALU)
item.oc.Analyzer.name=Analyzer
item.oc.APU0.name=Accelerated Processing Unit (APU) (Tier 1)
item.oc.APU1.name=Accelerated Processing Unit (APU) (Tier 2)
item.oc.APU0.name=Accelerated Processing Unit (APU) (Tier 2)
item.oc.APU1.name=Accelerated Processing Unit (APU) (Tier 3)
item.oc.APU2.name=Accelerated Processing Unit (APU) (Creative)
item.oc.ArrowKeys.name=Arrow Keys
item.oc.ButtonGroup.name=Button Group