diff options
| author | bombcar <github@bombcar.com> | 2021-11-22 08:46:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 08:46:30 -0600 |
| commit | db511ee36c4179283d3738ad27cdd232c1885888 (patch) | |
| tree | 6a4420be1342199617ff2ea1614cd4b2abb7e187 /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | 1949ecd687822eb674afffe243c13b6a408c50fc (diff) | |
| parent | fb4fecbf3f8858988e33279f35a49517d079eee4 (diff) | |
| download | GT5-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')
3 files changed, 4 insertions, 5 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, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java index 0a8624354b..bf4dffb904 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java @@ -1,4 +1,4 @@ -/* + package gtPlusPlus.xmod.gregtech.api.gui; import java.util.List; @@ -68,4 +68,4 @@ public class CONTAINER_TreeFarmer extends GT_ContainerMetaTile_Machine { } } -}*/ +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java index 762dcbf640..b236b0ff32 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java @@ -1,4 +1,4 @@ -/* + package gtPlusPlus.xmod.gregtech.api.gui; @@ -44,4 +44,3 @@ public class GUI_TreeFarmer extends GT_GUIContainerMetaTile_Machine { this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); } } -*/ |