AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-08 14:50:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/main/resources/assets/opencomputers/lang/en_US.lang
This commit is contained in:
payonel 2019-08-19 23:27:51 -07:00
commit ad0193688f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/assets/opencomputers/lang/en_US.lang
View File

@ -45,8 +45,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