diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-09-16 00:17:08 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-09-16 00:17:08 +0100 |
| commit | 6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2 (patch) | |
| tree | 5f0b682f5b1db4995f9324f8e0094989a9942153 /src/main/java/gregtech/api/items | |
| parent | b22bb2dfa6ec7d1e91d8657fcb8bd0389ff7e74a (diff) | |
| download | GT5-Unofficial-6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2.tar.gz GT5-Unofficial-6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2.tar.bz2 GT5-Unofficial-6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2.zip | |
Fix conflicts
Diffstat (limited to 'src/main/java/gregtech/api/items')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaBase_Item.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java index 75cea04054..7796691540 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -39,7 +39,6 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci * Creates the Item using these Parameters. * * @param aUnlocalized The Unlocalized Name of this Item. - * @param aGeneratedPrefixList The OreDict Prefixes you want to have generated. */ public GT_MetaBase_Item(String aUnlocalized) { super(aUnlocalized, "Generated Item", null, false); |