aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-01-18 12:58:15 +0100
committerGitHub <noreply@github.com>2021-01-18 12:58:15 +0100
commit38410c0dfba2223480c0dcdade894ce39c64a028 (patch)
treefcdabd71c82b960f1c05ca6e8542556d2c4395f5 /src/main/java/gregtech/api
parentdc10d4bc898fd2b7dc521628e829cc006c845f7e (diff)
parentf6d73cd25aab6ed26b7980a7eeaa2f21de1bf3cb (diff)
downloadGT5-Unofficial-38410c0dfba2223480c0dcdade894ce39c64a028.tar.gz
GT5-Unofficial-38410c0dfba2223480c0dcdade894ce39c64a028.tar.bz2
GT5-Unofficial-38410c0dfba2223480c0dcdade894ce39c64a028.zip
Merge pull request #411 from GTNewHorizons/remove_modular_armor
Debloat - Remove Modular Armor (It's buggy and not in use anyway)
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java1
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java14
2 files changed, 0 insertions, 15 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,
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 94efa0605f..57e42ea37f 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1553,20 +1553,6 @@ public enum ItemList implements IItemContainer {
Moxcell_2,
Moxcell_4,
- ModularBasicHelmet,
- ModularBasicChestplate,
- ModularBasicLeggings,
- ModularBasicBoots,
-
- ModularElectric1Helmet,
- ModularElectric1Chestplate,
- ModularElectric1Leggings,
- ModularElectric1Boots,
-
- ModularElectric2Helmet,
- ModularElectric2Chestplate,
- ModularElectric2Leggings,
- ModularElectric2Boots,
Block_Powderbarrel,
GelledToluene,