diff --git a/assets/tinker/textures/items/parts/string_bowstring.png b/assets/tinker/textures/items/parts/string_bowstring.png index 1df20778..e78d562c 100644 Binary files a/assets/tinker/textures/items/parts/string_bowstring.png and b/assets/tinker/textures/items/parts/string_bowstring.png differ diff --git a/tconstruct/TConstruct.java b/tconstruct/TConstruct.java index ba0d91b9..1323d772 100644 --- a/tconstruct/TConstruct.java +++ b/tconstruct/TConstruct.java @@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.5", dependencies = "required-after:Forge@[7.7.1.687,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.2_1.4.dev.25", dependencies = "required-after:Forge@[7.7.1.687,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { diff --git a/tconstruct/blocks/logic/CastingBasinLogic.java b/tconstruct/blocks/logic/CastingBasinLogic.java index 38811ad0..fe3a8fb0 100644 --- a/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/tconstruct/blocks/logic/CastingBasinLogic.java @@ -278,7 +278,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl @Override public FluidStack getFluid () { - return liquid.copy(); + return liquid == null ? null : liquid.copy(); } @Override diff --git a/tconstruct/blocks/logic/CastingTableLogic.java b/tconstruct/blocks/logic/CastingTableLogic.java index 8efc493f..d5eeac2a 100644 --- a/tconstruct/blocks/logic/CastingTableLogic.java +++ b/tconstruct/blocks/logic/CastingTableLogic.java @@ -278,7 +278,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl @Override public FluidStack getFluid () { - return liquid.copy(); + return liquid == null ? null : liquid.copy(); } @Override diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index e2f2dcf4..6bec5dd0 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -1656,6 +1656,9 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("nuggetAlumite", new ItemStack(materials, 1, 32)); OreDictionary.registerOre("nuggetSteel", new ItemStack(materials, 1, 33)); + String[] matNames = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", + "blueslime" }; + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; for (int i = 0; i < 16; i++)