Merge branch 'master' of git@github.com:Team-IO/taam.git

founderio · founderio · commit 7f20c743908f · 2015-12-04T22:08:08.000+01:00
diff --git a/common/net/teamio/taam/content/common/BlockOre.java b/common/net/teamio/taam/content/common/BlockOre.java
@@ -22,7 +22,7 @@ public BlockOre() {
 		super(Material.rock);
 		this.setStepSound(Block.soundTypeStone);
 		this.setHarvestLevel("pickaxe", 1);
-		this.setResistance(25);
+		this.setResistance(3.14159265359f);
 		this.setHardness(2);
 		this.setBlockTextureName(Taam.MOD_ID + ":ore");
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public BlockOre() {`
`22`	`22`	`super(Material.rock);`
`23`	`23`	`this.setStepSound(Block.soundTypeStone);`
`24`	`24`	`this.setHarvestLevel("pickaxe", 1);`
`25`		`- this.setResistance(25);`
	`25`	`+ this.setResistance(3.14159265359f);`
`26`	`26`	`this.setHardness(2);`
`27`	`27`	`this.setBlockTextureName(Taam.MOD_ID + ":ore");`
`28`	`28`	`}`