diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-10-18 20:08:16 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-10-18 20:08:16 +0200 |
| commit | 1bde4a911eb60b0a294c7a2663e521ef5175db1b (patch) | |
| tree | f98d6ae8842c61fbbe7da96a3d835ddb96034a59 /src/main/java/gregtech/api/interfaces | |
| parent | b25533322785b9101bc005af1510e6cfddf5cece (diff) | |
| parent | a53ca90e7fa20af828e313fd3a82ae211caf0acb (diff) | |
| download | GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.tar.gz GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.tar.bz2 GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.zip | |
Merge branch 'experimental' into GT_dev
# Conflicts:
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
Diffstat (limited to 'src/main/java/gregtech/api/interfaces')
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java index 2170b6543c..953e3e5dc4 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java @@ -95,7 +95,7 @@ public interface IGregTechTileEntity extends ITexturedTileEntity, IGearEnergyTil /** * Sets initial Values from NBT * - * @param tNBT is the NBTTag of readFromNBT + * @param aNBT is the NBTTag of readFromNBT * @param aID is the MetaTileEntityID */ public void setInitialValuesAsNBT(NBTTagCompound aNBT, short aID); |