Merge pull request #2799 from DorCoMaNdO/patch-3

Use getItemInMainHand()
This commit is contained in:
t00thpick1
2016-03-11 22:09:08 -05:00
26 changed files with 145 additions and 67 deletions

View File

@@ -508,4 +508,4 @@ Particles:
Sounds:
# This setting controls the master volume. 1.0 is Max, 0 would be off
MasterVolume: 1.0

View File

@@ -155,6 +155,8 @@ Experience:
Brown_Mushroom: 150
Cactus: 30
Carrot: 50
Chorus_Flower: 25
Chorus_Plant: 2
Cocoa: 30
Crops: 50
Dead_Bush: 30
@@ -185,6 +187,7 @@ Experience:
Coal_Ore: 100
Diamond_Ore: 750
Emerald_Ore: 1000
End_Bricks: 200
Ender_Stone: 150
Glowstone: 30
Gold_Ore: 350
@@ -202,6 +205,10 @@ Experience:
Stone: 30
Red_Sandstone: 100
Prismarine: 70
Purpur_Block: 200
Purpur_Pillar: 250
Purpur_Slab: 150
Purpur_Stairs: 250
Repair:
Base: 1000.0
Wood: 0.6
@@ -250,3 +257,4 @@ Experience:
Endermite: 2.0
Guardian: 3.0
Elder_Guardian: 4.0
Shulker: 2.0