aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/GregTech_API.java
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-01-18 17:47:05 +0100
committerGitHub <noreply@github.com>2021-01-18 17:47:05 +0100
commit872e69d7f7d0d5b67dfcbb83393f14d20fcbaa9e (patch)
treee19465225c5361794da4e95f2d6048b20bf55cca /src/main/java/gregtech/api/GregTech_API.java
parentc99a6e14495c82f6022e8676b412a37775af85f6 (diff)
parent4fa726bd845dce746eaa62a9a9afc2dec993917a (diff)
downloadGT5-Unofficial-872e69d7f7d0d5b67dfcbb83393f14d20fcbaa9e.tar.gz
GT5-Unofficial-872e69d7f7d0d5b67dfcbb83393f14d20fcbaa9e.tar.bz2
GT5-Unofficial-872e69d7f7d0d5b67dfcbb83393f14d20fcbaa9e.zip
Merge branch 'experimental' into mitchej123_cleanup
Diffstat (limited to 'src/main/java/gregtech/api/GregTech_API.java')
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 17f171a953..53bb805528 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -221,7 +221,6 @@ public class GregTech_API {
sRecipeFile = null,
sMachineFile = null,
sWorldgenFile = null,
- sModularArmor = null,
sMaterialProperties = null,
sMaterialComponents = null,
sUnification = null,