Merge branch '1.7.10' of https://github.com/sor1n/Modjam-Mod.git into 1.7.10

Conflicts:
	build.gradle

2 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockList.java b/src/main/java/darkknight/jewelrycraft/block/BlockList.java
index 032797c..9d3a54b 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockList.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockList.java
@@ -44,6 +44,7 @@ public class BlockList
         moltenMetalFluid = new Fluid("metal.molten").setLuminosity(15).setDensity(3000).setTemperature(2000).setViscosity(6000);

         if (!FluidRegistry.registerFluid(moltenMetalFluid)) moltenMetalFluid = FluidRegistry.getFluid("metal.molten");

         moltenMetal = new BlockMoltenMetal(moltenMetalFluid, Material.lava);

+        moltenMetalFluid.setBlock(moltenMetal);

         crystal = new BlockCrystal().setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeGlass).setBlockTextureName(Variables.MODID + ":blockCrystal").setBlockName(Variables.MODID + ".blockCrystal").setCreativeTab(JewelrycraftMod.jewelrycraft);

         

         GameRegistry.registerBlock(shadowOre, "shadowOre");

diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
index cd24deb..3c9b680 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -64,7 +64,7 @@ public class BlockSmelter extends BlockContainer {
 				int quant = (int) (te.quantity * 10);

 				ItemStack metalBucket = new ItemStack(ItemList.bucket);

 				JewelryNBT.addMetal(metalBucket, te.moltenMetal.copy());

-				if (quant == 9){

+				if (quant == 9) {

 					dropItem(world, i, j, k, new ItemStack(Blocks.cobblestone, 6));

 					dropItem(world, i, j, k, new ItemStack(Items.lava_bucket));

 					dropItem(world, i, j, k, metalBucket);

@@ -73,7 +73,7 @@ public class BlockSmelter extends BlockContainer {
 			world.removeTileEntity(i, j, k);

 		}

 	}

-	

+

 	@Override

 	public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) {

 		TileEntitySmelter te = (TileEntitySmelter) world.getTileEntity(i, j, k);