diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-09-05 18:41:37 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-09-05 18:41:37 +0200 |
| commit | 480848821f16989ed150bc98f749b6bf8db1faa6 (patch) | |
| tree | 2270ae650eed6fbc9ac137f1ce407f438e92f574 /src/main/resources/assets/gregtech/lang | |
| parent | 1698e57f729efb52e2b98e865a9671f0b50a5b2e (diff) | |
| parent | cb158871441d64678d256b784c40278b0f730d5e (diff) | |
| download | GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.tar.gz GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.tar.bz2 GT5-Unofficial-480848821f16989ed150bc98f749b6bf8db1faa6.zip | |
Merge branch 'New_hightier_stuff_dev' into New_test_dev
# Conflicts:
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/resources/assets/gregtech/lang')
| -rw-r--r-- | src/main/resources/assets/gregtech/lang/en_US.lang | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index de3a19fdec..0e0a8313e4 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -734,9 +734,15 @@ achievement.gt.blockmachines.fusioncomputer.tier.08=Fusion Computer Mark III achievement.gt.blockmachines.fusioncomputer.tier.08.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.03.32072=Neuro Processing Unit +achievement.gt.metaitem.03.32077.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32077=Bio Processing Unit achievement.gt.metaitem.03.32072.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.03.32095=Wetware Mainframe achievement.gt.metaitem.03.32095.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32099=Bioware Supercomputer +achievement.gt.metaitem.03.32099.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32120=Bio Mainframe +achievement.gt.metaitem.03.32120.desc=Pickup this item to see the recipe in NEI achievement.item.NanoCircuit=Nano Circuit achievement.item.NanoCircuit.desc=Pickup this item to see the recipe in NEI |