diff options
| author | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-13 23:39:55 +0100 |
|---|---|---|
| committer | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-13 23:39:55 +0100 |
| commit | a2a9ad400f23726885020f1a77627f9561487948 (patch) | |
| tree | 9116c76f46d49d951ac63442af335a0bd6016052 /src/main/resources/assets | |
| parent | 20b5d2932ef44e1c96104d6ec0528012f5c83d21 (diff) | |
| parent | 868ddab78797403d58dbc84d357f792926e94f42 (diff) | |
| download | GT5-Unofficial-a2a9ad400f23726885020f1a77627f9561487948.tar.gz GT5-Unofficial-a2a9ad400f23726885020f1a77627f9561487948.tar.bz2 GT5-Unofficial-a2a9ad400f23726885020f1a77627f9561487948.zip | |
Merge tag '1.7.20' into unified-build-script2
# Conflicts:
# build.properties
# src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
Diffstat (limited to 'src/main/resources/assets')
| -rw-r--r-- | src/main/resources/assets/miscutils/lang/en_US.lang | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index e2f034282a..c70d102235 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -1170,14 +1170,14 @@ item.itemRingQuantum.name=Quantum Ring item.itemScrewQuantum.name=Quantum Screw item.itemRotorQuantum.name=Quantum Rotor item.itemGearQuantum.name=Quantum Gear -item.itemDustFluorite.name=Fluorite Dust -item.itemDustTinyFluorite.name=Tiny Pile of Fluorite Dust -item.itemDustSmallFluorite.name=Small Pile of Fluorite Dust -item.crushedFluorite.name=Crushed Fluorite Ore -item.crushedCentrifugedFluorite.name=Centrifuged Crushed Fluorite Ore -item.crushedPurifiedFluorite.name=Purified Crushed Fluorite Ore -item.dustImpureFluorite.name=Impure Fluorite Dust -item.dustPureFluorite.name=Purified Fluorite Dust +item.itemDustFluoriteF.name=Fluorite (F) Dust +item.itemDustTinyFluoriteF.name=Tiny Pile of Fluorite (F) Dust +item.itemDustSmallFluoriteF.name=Small Pile of Fluorite (F) Dust +item.crushedFluoriteF.name=Crushed Fluorite (F) Ore +item.crushedCentrifugedFluoriteF.name=Centrifuged Crushed Fluorite (F) Ore +item.crushedPurifiedFluoriteF.name=Purified Crushed Fluorite (F) Ore +item.dustImpureFluoriteF.name=Impure Fluorite (F) Dust +item.dustPureFluoriteF.name=Purified Fluorite (F) Dust item.itemDustCrocoite.name=Crocoite Dust item.itemDustTinyCrocoite.name=Tiny Pile of Crocoite Dust item.itemDustSmallCrocoite.name=Small Pile of Crocoite Dust @@ -1890,7 +1890,7 @@ tile.Block of Quantum.name=Block of Quantum tile.Quantum Frame Box.name=Quantum Frame Box //Ores -tile.OreFluorite.name=Fluorite Ore +tile.OreFluoriteF.name=Fluorite (F) Ore tile.OreCrocoite.name=Crocoite Ore tile.OreGeikielite.name=Geikielite Ore tile.OreNichromite.name=Nichromite Ore |