Skip to content

Commit

Permalink
Bismuth Bronze is now made with 50-65% Copper. Red/Blue Steel is now …
Browse files Browse the repository at this point in the history
…made with 50-55% Black Steel. Debug mode now keeps crucibles over lit forges at a temperature of 2000.
  • Loading branch information
Kittychanley committed Sep 11, 2015
1 parent 8eaccfe commit 7587b67
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/Common/com/bioxx/tfc/ItemSetup.java
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ private static void registerMetals()

Alloy bismuthBronze = new Alloy(Global.BISMUTHBRONZE, Alloy.EnumTier.TierI);
bismuthBronze.addIngred(Global.ZINC, 19.99f, 30.01f);
bismuthBronze.addIngred(Global.COPPER, 49.99f, 70.01f);
bismuthBronze.addIngred(Global.COPPER, 49.99f, 65.01f);
bismuthBronze.addIngred(Global.BISMUTH, 9.99f, 20.01f);
AlloyManager.INSTANCE.addAlloy(bismuthBronze);

Expand All @@ -973,14 +973,14 @@ private static void registerMetals()
AlloyManager.INSTANCE.addAlloy(weakSteel);

Alloy weakRedSteel = new Alloy(Global.WEAKREDSTEEL, Alloy.EnumTier.TierIII);
weakRedSteel.addIngred(Global.BLACKSTEEL, 49.99f, 60.01f);
weakRedSteel.addIngred(Global.BLACKSTEEL, 49.99f, 55.01f);
weakRedSteel.addIngred(Global.ROSEGOLD, 9.99f, 15.01f);
weakRedSteel.addIngred(Global.BRASS, 9.99f, 15.01f);
weakRedSteel.addIngred(Global.STEEL, 19.99f, 25.01f);
AlloyManager.INSTANCE.addAlloy(weakRedSteel);

Alloy weakBlueSteel = new Alloy(Global.WEAKBLUESTEEL, Alloy.EnumTier.TierIII);
weakBlueSteel.addIngred(Global.BLACKSTEEL, 49.99f, 60.01f);
weakBlueSteel.addIngred(Global.BLACKSTEEL, 49.99f, 55.01f);
weakBlueSteel.addIngred(Global.BISMUTHBRONZE, 9.99f, 15.01f);
weakBlueSteel.addIngred(Global.STERLINGSILVER, 9.99f, 15.01f);
weakBlueSteel.addIngred(Global.STEEL, 19.99f, 25.01f);
Expand Down
9 changes: 4 additions & 5 deletions src/Common/com/bioxx/tfc/TileEntities/TECrucible.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
import com.bioxx.tfc.Core.TFC_Core;
import com.bioxx.tfc.Core.Metal.*;
import com.bioxx.tfc.Items.ItemMeltedMetal;
import com.bioxx.tfc.api.Metal;
import com.bioxx.tfc.api.TFCBlocks;
import com.bioxx.tfc.api.TFCItems;
import com.bioxx.tfc.api.TFC_ItemHeat;
import com.bioxx.tfc.api.*;
import com.bioxx.tfc.api.Constant.Global;
import com.bioxx.tfc.api.Interfaces.ISmeltable;

Expand Down Expand Up @@ -123,7 +120,9 @@ public void updateEntity()
if(worldObj.getBlock(xCoord, yCoord - 1, zCoord) == TFCBlocks.forge)
{
TEForge te = (TEForge) worldObj.getTileEntity(xCoord, yCoord - 1, zCoord);
if(te.fireTemp > temperature)
if (te.fireTemp >= 1 && TFCOptions.enableDebugMode)
temperature = 2000;
else if (te.fireTemp > temperature)
temperature++;
}
if(tempTick > 22)
Expand Down

0 comments on commit 7587b67

Please sign in to comment.