diff options
| author | Muramasa- <haydenkilloh@gmail.com> | 2016-08-22 22:50:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-22 22:50:58 +0100 |
| commit | ccfc536501e8133794ec2a0c5f2a589201af81d6 (patch) | |
| tree | c9f8c9af123f7fce7a942a2130973c51cfb3b65b /src/main/java/gregtech/api/GregTech_API.java | |
| parent | 0476a036352600b83133caf167ac5dee4b9b5176 (diff) | |
| parent | 5a94ea039ba265d966aaa7872aecb79a4851769d (diff) | |
| download | GT5-Unofficial-ccfc536501e8133794ec2a0c5f2a589201af81d6.tar.gz GT5-Unofficial-ccfc536501e8133794ec2a0c5f2a589201af81d6.tar.bz2 GT5-Unofficial-ccfc536501e8133794ec2a0c5f2a589201af81d6.zip | |
Merge pull request #603 from Muramasa-/Mats
Material Rework
Diffstat (limited to 'src/main/java/gregtech/api/GregTech_API.java')
| -rw-r--r-- | src/main/java/gregtech/api/GregTech_API.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 3fe74662dd..99abd6a801 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -169,7 +169,7 @@ public class GregTech_API { /** * The Configuration Objects */ - public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null; + public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null, sMaterialsFile = null; public static int TICKS_FOR_LAG_AVERAGING = 25, MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100; /** * Initialized by the Block creation. |