aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java6
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java8
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java4
3 files changed, 11 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
index 1c1479eba0..70ab4d38f5 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
@@ -70,9 +70,9 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
@Override
public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
list.add("");
- list.add(EnumChatFormatting.GREEN+"Worn as a Ring within Baubles."+EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GREEN+"Prevents you from sprinting and keeps you stuck crouching."+EnumChatFormatting.GRAY);
- list.add(EnumChatFormatting.GREEN+"Press shift once worn to active, take off to stop the effect."+EnumChatFormatting.GRAY);
+ list.add(EnumChatFormatting.GREEN+"Worn as a Ring within Baubles. Prevents you from sprinting."+EnumChatFormatting.GRAY);
+ list.add(EnumChatFormatting.GREEN+"Movement speed reduced to crouch speed."+EnumChatFormatting.GRAY);
+ list.add(EnumChatFormatting.GREEN+"Press shift while worn to toggle crouch on/off."+EnumChatFormatting.GRAY);
list.add("");
super.addInformation(stack, aPlayer, list, bool);
}
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index fa48446c1c..0d087fe246 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -20,13 +20,15 @@ public final class NUCLIDE {
public static final Material LiFBeF2ThF4UF4 = new Material(
- "Reactor Salt LiFBeF2ThF4UF4", //Material Name
+ "LiFBeF2ThF4UF4", //Material Name
new short[]{40, 90, 25, 0}, //Material Colour
566, //Melting Point in C
870, //Boiling Point in C
150, //Protons
150, //Neutrons
false, //Uses Blast furnace?
+ MaterialUtils.subscript(MaterialUtils.superscript("7")+"LiFBeF2ThF4UF4"), //Chemical Formula
+ 5, //Radioactivity Level
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
@@ -36,13 +38,15 @@ public final class NUCLIDE {
});
public static final Material LiFBeF2ZrF4U235 = new Material(
- "Reactor Salt LiFBeF2ZrF4U235", //Material Name
+ "LiFBeF2ZrF4U235", //Material Name
new short[]{50, 70, 15, 0}, //Material Colour
590, //Melting Point in C
890, //Boiling Point in C
150, //Protons
150, //Neutrons
false, //Uses Blast furnace?
+ MaterialUtils.subscript(MaterialUtils.superscript("7")+"LiFBeF2ZrF4")+MaterialUtils.superscript("235U"), //Chemical Formula
+ 5, //Radioactivity Level
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 4c639e8e13..899eff8cf2 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -341,7 +341,7 @@ public class RECIPES_GREGTECH {
try {
//Fli2BeF4 + Uranium235 = 1x Uranium233
CORE.RA.addLFTRRecipe(
- FluidUtils.getFluidStack("molten.uranium", 144*64), //Fluid input (slot 1)
+ FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 144*64), //Fluid input (slot 1)
FluidUtils.getFluidStack("molten.li2bef4", 144*12), //Fluid output (slot 2)
FluidUtils.getFluidStack("molten.uraniumhexafluoride", 6*144), //Output Array of Items - Upto 9,
120*60*20, //Time in ticks
@@ -350,7 +350,7 @@ public class RECIPES_GREGTECH {
try {
//Fli2BeF4 + Uranium233 TetraFluoride = Uranium233
CORE.RA.addLFTRRecipe(
- FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 200), //Fluid input (slot 1)
+ FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 200), //Fluid input (slot 1)
FluidUtils.getFluidStack("molten.li2bef4", 1000), //Fluid output (slot 2)
FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1200), //Output Array of Items - Upto 9,
16000*20, //Time in ticks