aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/items/CombType.java2
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java3
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 5b152edc97..ca5e4d4df9 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -96,7 +96,7 @@ public enum CombType {
PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
NAQUADAH("naquadah", true, Materials.Naquadah, 10),
NAQUADRIA("naquadria", true, Materials.Naquadria, 5),
- DOB("dob", true, Materials._NULL, 50),
+ DOB("d-o-b", true, Materials._NULL, 50),
THORIUM("thorium", true, Materials.Thorium, 75),
LUTETIUM("lutetium", true, Materials.Lutetium, 10),
AMERICUM("americum", true, Materials.Americium, 5),
diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java
index 740ae9be3f..244d25c609 100644
--- a/src/main/java/gregtech/common/items/ItemDrop.java
+++ b/src/main/java/gregtech/common/items/ItemDrop.java
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
+import forestry.api.recipes.RecipeManagers;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_ModHandler;
@@ -109,9 +110,11 @@ public class ItemDrop extends Item {
public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 32, aEUt);
+ RecipeManagers.squeezerManager.addRecipe(40, new ItemStack[]{tDrop}, aOutput, aOutput2, 30);
}
public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aDuration, int aEUt) {
GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, aDuration, aEUt);
+ RecipeManagers.squeezerManager.addRecipe(400, new ItemStack[]{tDrop}, aOutput, aOutput2, 30);
}
public void addProcessMV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 64, aEUt);
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index bfc594f2d4..3417188bc1 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -2950,7 +2950,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH);
String species = "species" + WordUtils.capitalize(lowercaseName);
- String uid = "gregtech." + species;//TODO String uid = "gendustry.bee." + species;
+ String uid = "gendustry.bee." + species;
String description = "for.description." + species;
String name = "for.bees.species." + lowercaseName;