Merge branch '繧｢繧､繝・Β邉ｻ邨ｱ霑ｽ蜉

'

Conflicts:
	common/pcc/chemicraft/ChemiCraft.java
	common/pcc/chemicraft/item/ItemDust.java

diff --cc common/pcc/chemicraft/ChemiCraft.java
Simple merge

diff --cc common/pcc/chemicraft/item/ItemDust.java
index 6a0cd3b,192545c..9b17cac
--- 1/common/pcc/chemicraft/item/ItemDust.java
--- 2/common/pcc/chemicraft/item/ItemDust.java
+++ b/common/pcc/chemicraft/item/ItemDust.java
@@@ -18,10 -18,13 +18,15 @@@ public class ItemDust extends Item 
        @Override
        public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World,
                        EntityPlayer par3EntityPlayer) {
-               par2World.spawnEntityInWorld(new EntityDust(par2World,
-                               par3EntityPlayer.posX,
-                               par3EntityPlayer.posY,
-                               par3EntityPlayer.posZ));
++
++
+               if (!par2World.isRemote) {
+                       par2World.spawnEntityInWorld(new EntityDust(par2World,
+                                       par3EntityPlayer.posX,
+                                       par3EntityPlayer.posY,
+                                       par3EntityPlayer.posZ));
+                       par1ItemStack.stackSize--;
+               }
                return par1ItemStack;
        }