aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api
diff options
context:
space:
mode:
authorbombcar <github@bombcar.com>2021-11-19 13:18:28 -0600
committerGitHub <noreply@github.com>2021-11-19 13:18:28 -0600
commit176a44820664a7d84ac9a6f53c7d0825e7f3ad5f (patch)
tree05fcf97d7a4b29d8036c691158cbeba1a519edeb /src/Java/gtPlusPlus/xmod/gregtech/api
parent80d9ec85bde12851b92ec39dbd4f9dc8eee7e427 (diff)
parentd4e972645c58ee1d86d074b255e078849dd6917a (diff)
downloadGT5-Unofficial-176a44820664a7d84ac9a6f53c7d0825e7f3ad5f.tar.gz
GT5-Unofficial-176a44820664a7d84ac9a6f53c7d0825e7f3ad5f.tar.bz2
GT5-Unofficial-176a44820664a7d84ac9a6f53c7d0825e7f3ad5f.zip
Merge branch 'GTNewHorizons:master' into master
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 8c780c6730..205aad3546 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -227,7 +227,7 @@ public enum GregtechItemList implements GregtechItemContainer {
//LFTR
- /*ThoriumReactor,*/
+ ThoriumReactor,
Casing_Reactor_I,
Casing_Reactor_II,
@@ -238,7 +238,7 @@ public enum GregtechItemList implements GregtechItemContainer {
//Fission Fuel Refinery
- /*Industrial_FuelRefinery,*/
+ Industrial_FuelRefinery,
Casing_Refinery_External,
Casing_Refinery_Structural,
Casing_Refinery_Internal,