aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api/enums
diff options
context:
space:
mode:
authorbombcar <github@bombcar.com>2021-11-22 08:46:30 -0600
committerGitHub <noreply@github.com>2021-11-22 08:46:30 -0600
commitdb511ee36c4179283d3738ad27cdd232c1885888 (patch)
tree6a4420be1342199617ff2ea1614cd4b2abb7e187 /src/Java/gtPlusPlus/xmod/gregtech/api/enums
parent1949ecd687822eb674afffe243c13b6a408c50fc (diff)
parentfb4fecbf3f8858988e33279f35a49517d079eee4 (diff)
downloadGT5-Unofficial-db511ee36c4179283d3738ad27cdd232c1885888.tar.gz
GT5-Unofficial-db511ee36c4179283d3738ad27cdd232c1885888.tar.bz2
GT5-Unofficial-db511ee36c4179283d3738ad27cdd232c1885888.zip
Merge branch 'GTNewHorizons:master' into master
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/enums')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 205aad3546..fd5ceed89b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -266,7 +266,7 @@ public enum GregtechItemList implements GregtechItemContainer {
//Tree Farm
- /*Industrial_TreeFarm, */
+ Industrial_TreeFarm,
TreeFarmer_Structural,
Casing_PLACEHOLDER_TreeFarmer,