diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-09-05 20:21:55 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-09-05 20:21:55 +0200 |
| commit | ba89cb91a05d1d4b6856ee11495146a03527c3a1 (patch) | |
| tree | 2b3a91bdf720fbdf34c13a33b6d4a0ca8212f8c9 /src/main/java/gregtech/api | |
| parent | 480848821f16989ed150bc98f749b6bf8db1faa6 (diff) | |
| parent | 14650eeda4d61b205f0f035588ed7106f03ef43a (diff) | |
| download | GT5-Unofficial-ba89cb91a05d1d4b6856ee11495146a03527c3a1.tar.gz GT5-Unofficial-ba89cb91a05d1d4b6856ee11495146a03527c3a1.tar.bz2 GT5-Unofficial-ba89cb91a05d1d4b6856ee11495146a03527c3a1.zip | |
Merge branch 'New_hightier_stuff_dev' into New_test_dev
# Conflicts:
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 4e8ba9eef5..0de94829d3 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -535,7 +535,6 @@ public enum ItemList implements IItemContainer { Generator_Naquadah_Mark_III, Generator_Naquadah_Mark_IV, Generator_Naquadah_Mark_V, - Generator_Naquadah_Mark_VI, Machine_Bronze_Boiler, Machine_Bronze_Boiler_Solar, Machine_Bronze_CraftingTable, diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 17f1ef81a3..d32516912f 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -583,7 +583,6 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public static final GT_Recipe_Map_Fuel sFluidNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.fluidnaquadahreactor", "Naquadah Reactor MkIII", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
public static final GT_Recipe_Map_Fuel sHugeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.hugenaquadahreactor", "Naquadah Reactor MkIV", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
public static final GT_Recipe_Map_Fuel sExtraHugeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.extrahugenaquadahreactor", "Naquadah Reactor MkV", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
- public static final GT_Recipe_Map_Fuel sUltraHugeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.ultrahugenaquadahreactor", "Naquadah Reactor MkV", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
public static final GT_Recipe_Map_LargeBoilerFakeFuels sLargeBoilerFakeFuels = new GT_Recipe_Map_LargeBoilerFakeFuels();
/**
|