Merge remote-tracking branch 'upstream/master'

src/main/java/mekanism/client/ClientProxy.java

@@ -51,6 +51,7 @@ import mekanism.client.render.RenderPartTransmitter;
 import mekanism.client.render.RenderTickHandler;
 import mekanism.client.render.block.BasicRenderingHandler;
 import mekanism.client.render.block.MachineRenderingHandler;
+import mekanism.client.render.block.PlasticRenderingHandler;
 import mekanism.client.render.entity.RenderBalloon;
 import mekanism.client.render.entity.RenderObsidianTNTPrimed;
 import mekanism.client.render.entity.RenderRobit;
@@ -159,6 +160,7 @@ public class ClientProxy extends CommonProxy
 {
 	public static int MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
 	public static int BASIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+	public static int PLASTIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
 
 	@Override
 	public void loadConfiguration()
@@ -339,6 +341,7 @@ public class ClientProxy extends CommonProxy
 		//Register block handlers
 		RenderingRegistry.registerBlockHandler(new MachineRenderingHandler());
 		RenderingRegistry.registerBlockHandler(new BasicRenderingHandler());
+		RenderingRegistry.registerBlockHandler(new PlasticRenderingHandler());
 
 		Mekanism.logger.info("Render registrations complete.");
 	}

src/main/java/mekanism/client/gui/GuiElectricPump.java

@@ -39,6 +39,7 @@ public class GuiElectricPump extends GuiMekanism
 				return tileEntity.fluidTank;
 			}
 		}, GuiGauge.Type.STANDARD, this, guiLocation, 6, 13));
+		guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation));
 
 	}
 

src/main/java/mekanism/client/render/RenderGlowPanel.java

@@ -55,18 +55,12 @@ public class RenderGlowPanel implements IIconSelfRegister
 		{
 			c.computeLighting(LightModel.standardLightModel);
 		}
-
-		for(CCModel c : lightModels)
-		{
-			c.computeLighting(LightModel.standardLightModel);
-		}
 	}
 
 	public void renderStatic(PartGlowPanel panel)
 	{
 		CCRenderState.reset();
 		CCRenderState.setBrightness(panel.world(), panel.x(), panel.y(), panel.z());
-		CCRenderState.hasColour = true;
 
 		Colour colour = new ColourRGBA(panel.colour.getColor(0), panel.colour.getColor(1), panel.colour.getColor(2), 1);
 		int side = panel.side.ordinal();

src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java

@@ -0,0 +1,94 @@
+package mekanism.client.render.block;
+
+import mekanism.client.ClientProxy;
+import mekanism.client.render.MekanismRenderer;
+import mekanism.common.Mekanism;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler
+{
+	@Override
+	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
+	{
+		MekanismRenderer.renderItem(renderer, metadata, block);
+	}
+
+	@Override
+	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
+	{
+		boolean flag = false;
+		if(block == Mekanism.BlockGlowHDPE)
+		{
+			Tessellator tessellator = Tessellator.instance;
+			tessellator.setBrightness(240);
+			int meta = world.getBlockMetadata(x, y, z);
+			int l = block.getRenderColor(meta);
+			int r = l >> 16 & 0xFF;
+			int g = l >> 8 & 0xFF;
+			int b = l & 0xFF;
+			tessellator.setColorOpaque(r, g, b);
+
+			if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y - 1, z, 0)))
+			{
+				renderer.renderFaceYNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 0));
+				flag = true;
+			}
+
+			if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y + 1, z, 1)))
+			{
+				renderer.renderFaceYPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 1));
+				flag = true;
+			}
+
+			if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y, z - 1, 2)))
+			{
+				renderer.renderFaceZNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 2));
+				flag = true;
+			}
+
+			if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y, z + 1, 3)))
+			{
+				renderer.renderFaceZPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 3));
+				flag = true;
+			}
+
+			if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x - 1, y, z, 4)))
+			{
+				renderer.renderFaceXNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 4));
+				flag = true;
+			}
+
+			if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x + 1, y, z, 5)))
+			{
+				renderer.renderFaceXPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 5));
+				flag = true;
+			}
+
+			return flag;
+		}
+		flag = renderer.renderStandardBlock(block, x, y, z);
+		renderer.setRenderBoundsFromBlock(block);
+		return flag;
+
+	}
+
+	@Override
+	public int getRenderId()
+	{
+		return ClientProxy.PLASTIC_RENDER_ID;
+	}
+
+	@Override
+	public boolean shouldRender3DInInventory(int modelId)
+	{
+		return true;
+	}
+}

src/main/java/mekanism/common/block/BlockPlastic.java

@@ -3,6 +3,7 @@ package mekanism.common.block;
 import java.util.List;
 
 import mekanism.api.EnumColor;
+import mekanism.client.ClientProxy;
 import mekanism.common.Mekanism;
 
 import net.minecraft.block.Block;
@@ -122,4 +123,11 @@ public class BlockPlastic extends Block
 		}
 		return false;
 	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getRenderType()
+	{
+		return ClientProxy.PLASTIC_RENDER_ID;
+	}
 }

src/main/java/mekanism/common/multipart/PartSidedPipe.java

@@ -499,7 +499,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
 
 		if(!world().isRemote)
 		{
-			if(getAllCurrentConnections() != (possibleAcceptors | possibleAcceptors))
+			if(getAllCurrentConnections() != (possibleTransmitters | possibleAcceptors))
 			{
 				sendDesc = true;
 			}

src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java

@@ -20,6 +20,7 @@ import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.InventoryUtils;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
+import mekanism.common.util.StatUtils;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -111,7 +112,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM
 					operatingTicks = 0;
 				}
 
-				gasTank.draw(MekanismUtils.getSecondaryEnergyPerTick(this, SECONDARY_ENERGY_PER_TICK), true);
+				gasTank.draw(StatUtils.inversePoisson(MekanismUtils.getSecondaryEnergyPerTickMean(this, SECONDARY_ENERGY_PER_TICK)), true);
 				electricityStored -= MekanismUtils.getEnergyPerTick(this, ENERGY_PER_TICK);
 			}
 			else {

src/main/java/mekanism/common/tile/TileEntityElectricPump.java

@@ -12,6 +12,7 @@ import mekanism.api.Coord4D;
 import mekanism.api.EnumColor;
 import mekanism.api.IConfigurable;
 import mekanism.common.ISustainedTank;
+import mekanism.common.IRedstoneControl;
 import mekanism.common.Mekanism;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.FluidContainerUtils;
@@ -36,7 +37,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 import io.netty.buffer.ByteBuf;
 
-public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IConfigurable
+public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IConfigurable, IRedstoneControl
 {
 	/** This pump's tank */
 	public FluidTank fluidTank = new FluidTank(10000);
@@ -44,6 +45,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 	/** The nodes that have full sources near them or in them */
 	public Set<Coord4D> recurringNodes = new HashSet<Coord4D>();
 
+	/** This machine's current RedstoneControl type. */
+	public RedstoneControl controlType = RedstoneControl.DISABLED;
+
 	public TileEntityElectricPump()
 	{
 		super("ElectricPump", 10000);
@@ -118,11 +122,18 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 			}
 		}
 
-		if(!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0)
+		if(!worldObj.isRemote && ticker % 20 == 0)
 		{
-			if(getEnergy() >= Mekanism.electricPumpUsage && (fluidTank.getFluid() == null || fluidTank.getFluid().amount+FluidContainerRegistry.BUCKET_VOLUME <= fluidTank.getCapacity()))
+			if(MekanismUtils.canFunction(this))
 			{
-				suck(true);
+				if(getEnergy() >= Mekanism.electricPumpUsage && (fluidTank.getFluid() == null || fluidTank.getFluid().amount + FluidContainerRegistry.BUCKET_VOLUME <= fluidTank.getCapacity()))
+				{
+					suck(true);
+				}
+			}
+			else
+			{
+				ticker--;
 			}
 		}
 
@@ -237,6 +248,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 		else {
 			fluidTank.setFluid(null);
 		}
+		controlType = RedstoneControl.values()[dataStream.readInt()];
 
 		MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord);
 	}
@@ -255,6 +267,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 		else {
 			data.add(0);
 		}
+		data.add(controlType.ordinal());
 
 		return data;
 	}
@@ -274,6 +287,8 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 			nbtTags.setTag("fluidTank", fluidTank.writeToNBT(new NBTTagCompound()));
 		}
 
+		nbtTags.setInteger("controlType", controlType.ordinal());
+
 		NBTTagList recurringList = new NBTTagList();
 
 		for(Coord4D wrapper : recurringNodes)
@@ -299,6 +314,11 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 			fluidTank.readFromNBT(nbtTags.getCompoundTag("fluidTank"));
 		}
 
+		if(nbtTags.hasKey("controlType"))
+		{
+			controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")];
+		}
+
 		if(nbtTags.hasKey("recurringNodes"))
 		{
 			NBTTagList tagList = nbtTags.getTagList("recurringNodes", NBT.TAG_COMPOUND);
@@ -456,4 +476,17 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 	{
 		return false;
 	}
+
+	@Override
+	public RedstoneControl getControlType()
+	{
+		return controlType;
+	}
+
+	@Override
+	public void setControlType(RedstoneControl type)
+	{
+		controlType = type;
+		MekanismUtils.saveChunk(this);
+	}
 }

src/main/java/mekanism/common/tile/TileEntityFactory.java

@@ -32,6 +32,7 @@ import mekanism.common.tile.component.TileComponentUpgrade;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.InventoryUtils;
 import mekanism.common.util.MekanismUtils;
+import mekanism.common.util.StatUtils;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -351,7 +352,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
 
 	public int getSecondaryEnergyPerTick()
 	{
-		return MekanismUtils.getSecondaryEnergyPerTick(this, RecipeType.values()[recipeType].getSecondaryEnergyPerTick());
+		return StatUtils.inversePoisson(MekanismUtils.getSecondaryEnergyPerTickMean(this, RecipeType.values()[recipeType].getSecondaryEnergyPerTick()));
 	}
 
 	public void handleSecondaryFuel()

src/main/java/mekanism/common/util/MekanismUtils.java

@@ -634,7 +634,18 @@ public final class MekanismUtils
 	 */
 	public static int getSecondaryEnergyPerTick(IUpgradeManagement mgmt, int def)
 	{
-		return (int)(def * Math.pow(Mekanism.maxUpgradeMultiplier, (mgmt.getSpeedMultiplier()-mgmt.getEnergyMultiplier())/8.0));
+		return (int)getSecondaryEnergyPerTickMean(mgmt, def);
+	}
+
+	/**
+	 * Gets the secondary energy required per tick for a machine via upgrades.
+	 * @param mgmt - tile containing upgrades
+	 * @param def - the original, default secondary energy required
+	 * @return max secondary energy per tick
+	 */
+	public static double getSecondaryEnergyPerTickMean(IUpgradeManagement mgmt, int def)
+	{
+		return (def * Math.pow(Mekanism.maxUpgradeMultiplier, (mgmt.getSpeedMultiplier()-mgmt.getEnergyMultiplier())/8.0));
 	}
 
 	/**

src/main/java/mekanism/common/util/StatUtils.java

@@ -0,0 +1,30 @@
+package mekanism.common.util;
+
+import java.util.Random;
+
+import static java.lang.Math.ceil;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.exp;
+import static java.lang.Math.pow;
+import static java.lang.Math.PI;
+import static java.lang.Math.E;
+
+public class StatUtils
+{
+	public static Random rand = new Random();
+
+	public static int inversePoisson(double mean)
+	{
+		double r = rand.nextDouble() * exp(mean);
+		int m = 0;
+		double p = 1;
+		double stirlingValue = mean * E;
+		double stirlingCoeff = 1 / sqrt(2 * PI);
+		while ((p < r) && (m < 3*ceil(mean)))
+		{
+			m ++;
+			p += stirlingCoeff/sqrt(m) * pow((stirlingValue/m), m);
+		}
+		return m;
+	}
+}

src/main/java/mekanism/tools/common/MekanismTools.java

@@ -554,8 +554,10 @@ public class MekanismTools implements IModule
 		BronzeShovel = new ItemMekanismShovel(toolBRONZE).setUnlocalizedName("BronzeShovel");
 		BronzeHoe = new ItemMekanismHoe(toolBRONZE).setUnlocalizedName("BronzeHoe");
 		BronzeSword = new ItemMekanismSword(toolBRONZE).setUnlocalizedName("BronzeSword");
-		
+
-		BronzePaxel.setHarvestLevel("paxel", toolBRONZE2.getHarvestLevel());
+		BronzePaxel.setHarvestLevel("pickaxe", toolBRONZE2.getHarvestLevel());
+		BronzePaxel.setHarvestLevel("axe", toolBRONZE2.getHarvestLevel());
+		BronzePaxel.setHarvestLevel("shovel", toolBRONZE2.getHarvestLevel());
 		BronzePickaxe.setHarvestLevel("pickaxe", toolBRONZE.getHarvestLevel());
 		BronzeAxe.setHarvestLevel("axe", toolBRONZE.getHarvestLevel());
 		BronzeShovel.setHarvestLevel("shovel", toolBRONZE.getHarvestLevel());
@@ -571,8 +573,10 @@ public class MekanismTools implements IModule
 		OsmiumShovel = new ItemMekanismShovel(toolOSMIUM).setUnlocalizedName("OsmiumShovel");
 		OsmiumHoe = new ItemMekanismHoe(toolOSMIUM).setUnlocalizedName("OsmiumHoe");
 		OsmiumSword = new ItemMekanismSword(toolOSMIUM).setUnlocalizedName("OsmiumSword");
-		
+
-		OsmiumPaxel.setHarvestLevel("paxel", toolOSMIUM2.getHarvestLevel());
+		OsmiumPaxel.setHarvestLevel("pickaxe", toolOSMIUM2.getHarvestLevel());
+		OsmiumPaxel.setHarvestLevel("axe", toolOSMIUM2.getHarvestLevel());
+		OsmiumPaxel.setHarvestLevel("shovel", toolOSMIUM2.getHarvestLevel());
 		OsmiumPickaxe.setHarvestLevel("pickaxe", toolOSMIUM.getHarvestLevel());
 		OsmiumAxe.setHarvestLevel("axe", toolOSMIUM.getHarvestLevel());
 		OsmiumShovel.setHarvestLevel("shovel", toolOSMIUM.getHarvestLevel());
@@ -588,8 +592,10 @@ public class MekanismTools implements IModule
 		ObsidianShovel = new ItemMekanismShovel(toolOBSIDIAN).setUnlocalizedName("ObsidianShovel");
 		ObsidianHoe = new ItemMekanismHoe(toolOBSIDIAN).setUnlocalizedName("ObsidianHoe");
 		ObsidianSword = new ItemMekanismSword(toolOBSIDIAN).setUnlocalizedName("ObsidianSword");
-		
+
-		ObsidianPaxel.setHarvestLevel("paxel", toolOBSIDIAN2.getHarvestLevel());
+		ObsidianPaxel.setHarvestLevel("pickaxe", toolOBSIDIAN2.getHarvestLevel());
+		ObsidianPaxel.setHarvestLevel("axe", toolOBSIDIAN2.getHarvestLevel());
+		ObsidianPaxel.setHarvestLevel("shovel", toolOBSIDIAN2.getHarvestLevel());
 		ObsidianPickaxe.setHarvestLevel("pickaxe", toolOBSIDIAN.getHarvestLevel());
 		ObsidianAxe.setHarvestLevel("axe", toolOBSIDIAN.getHarvestLevel());
 		ObsidianShovel.setHarvestLevel("shovel", toolOBSIDIAN.getHarvestLevel());
@@ -605,8 +611,10 @@ public class MekanismTools implements IModule
 		LazuliShovel = new ItemMekanismShovel(toolLAZULI).setUnlocalizedName("LazuliShovel");
 		LazuliHoe = new ItemMekanismHoe(toolLAZULI).setUnlocalizedName("LazuliHoe");
 		LazuliSword = new ItemMekanismSword(toolLAZULI).setUnlocalizedName("LazuliSword");
-		
+
-		LazuliPaxel.setHarvestLevel("paxel", toolLAZULI2.getHarvestLevel());
+		LazuliPaxel.setHarvestLevel("pickaxe", toolLAZULI2.getHarvestLevel());
+		LazuliPaxel.setHarvestLevel("axe", toolLAZULI2.getHarvestLevel());
+		LazuliPaxel.setHarvestLevel("shovel", toolLAZULI2.getHarvestLevel());
 		LazuliPickaxe.setHarvestLevel("pickaxe", toolLAZULI.getHarvestLevel());
 		LazuliAxe.setHarvestLevel("axe", toolLAZULI.getHarvestLevel());
 		LazuliShovel.setHarvestLevel("shovel", toolLAZULI.getHarvestLevel());
@@ -622,8 +630,10 @@ public class MekanismTools implements IModule
 		GlowstoneShovel = new ItemMekanismShovel(toolGLOWSTONE).setUnlocalizedName("GlowstoneShovel");
 		GlowstoneHoe = new ItemMekanismHoe(toolGLOWSTONE).setUnlocalizedName("GlowstoneHoe");
 		GlowstoneSword = new ItemMekanismSword(toolGLOWSTONE).setUnlocalizedName("GlowstoneSword");
-		
+
-		GlowstonePaxel.setHarvestLevel("paxel", toolGLOWSTONE2.getHarvestLevel());
+		GlowstonePaxel.setHarvestLevel("pickaxe", toolGLOWSTONE2.getHarvestLevel());
+		GlowstonePaxel.setHarvestLevel("axe", toolGLOWSTONE2.getHarvestLevel());
+		GlowstonePaxel.setHarvestLevel("shovel", toolGLOWSTONE2.getHarvestLevel());
 		GlowstonePickaxe.setHarvestLevel("pickaxe", toolGLOWSTONE.getHarvestLevel());
 		GlowstoneAxe.setHarvestLevel("axe", toolGLOWSTONE.getHarvestLevel());
 		GlowstoneShovel.setHarvestLevel("shovel", toolGLOWSTONE.getHarvestLevel());
@@ -639,8 +649,10 @@ public class MekanismTools implements IModule
 		SteelShovel = new ItemMekanismShovel(toolSTEEL).setUnlocalizedName("SteelShovel");
 		SteelHoe = new ItemMekanismHoe(toolSTEEL).setUnlocalizedName("SteelHoe");
 		SteelSword = new ItemMekanismSword(toolSTEEL).setUnlocalizedName("SteelSword");
-		
+
-		SteelPaxel.setHarvestLevel("paxel", toolSTEEL2.getHarvestLevel());
+		SteelPaxel.setHarvestLevel("pickaxe", toolSTEEL2.getHarvestLevel());
+		SteelPaxel.setHarvestLevel("axe", toolSTEEL2.getHarvestLevel());
+		SteelPaxel.setHarvestLevel("shovel", toolSTEEL2.getHarvestLevel());
 		SteelPickaxe.setHarvestLevel("pickaxe", toolSTEEL.getHarvestLevel());
 		SteelAxe.setHarvestLevel("axe", toolSTEEL.getHarvestLevel());
 		SteelShovel.setHarvestLevel("shovel", toolSTEEL.getHarvestLevel());
@@ -651,13 +663,23 @@ public class MekanismTools implements IModule
 		IronPaxel = new ItemMekanismPaxel(ToolMaterial.IRON).setUnlocalizedName("IronPaxel");
 		DiamondPaxel = new ItemMekanismPaxel(ToolMaterial.EMERALD).setUnlocalizedName("DiamondPaxel");
 		GoldPaxel = new ItemMekanismPaxel(ToolMaterial.GOLD).setUnlocalizedName("GoldPaxel");
-		
+
-		WoodPaxel.setHarvestLevel("paxel", ToolMaterial.WOOD.getHarvestLevel());
+		WoodPaxel.setHarvestLevel("pickaxe", ToolMaterial.WOOD.getHarvestLevel());
-		StonePaxel.setHarvestLevel("paxel", ToolMaterial.STONE.getHarvestLevel());
+		WoodPaxel.setHarvestLevel("axe", ToolMaterial.WOOD.getHarvestLevel());
-		IronPaxel.setHarvestLevel("paxel", ToolMaterial.IRON.getHarvestLevel());
+		WoodPaxel.setHarvestLevel("shovel", ToolMaterial.WOOD.getHarvestLevel());
-		DiamondPaxel.setHarvestLevel("paxel", ToolMaterial.EMERALD.getHarvestLevel());
+		StonePaxel.setHarvestLevel("pickaxe", ToolMaterial.STONE.getHarvestLevel());
-		GoldPaxel.setHarvestLevel("paxel", ToolMaterial.GOLD.getHarvestLevel());
+		StonePaxel.setHarvestLevel("axe", ToolMaterial.STONE.getHarvestLevel());
-		
+		StonePaxel.setHarvestLevel("shovel", ToolMaterial.STONE.getHarvestLevel());
+		IronPaxel.setHarvestLevel("pickaxe", ToolMaterial.IRON.getHarvestLevel());
+		IronPaxel.setHarvestLevel("axe", ToolMaterial.IRON.getHarvestLevel());
+		IronPaxel.setHarvestLevel("shovel", ToolMaterial.IRON.getHarvestLevel());
+		DiamondPaxel.setHarvestLevel("pickaxe", ToolMaterial.EMERALD.getHarvestLevel());
+		DiamondPaxel.setHarvestLevel("axe", ToolMaterial.EMERALD.getHarvestLevel());
+		DiamondPaxel.setHarvestLevel("shovel", ToolMaterial.EMERALD.getHarvestLevel());
+		GoldPaxel.setHarvestLevel("pickaxe", ToolMaterial.GOLD.getHarvestLevel());
+		GoldPaxel.setHarvestLevel("axe", ToolMaterial.GOLD.getHarvestLevel());
+		GoldPaxel.setHarvestLevel("shovel", ToolMaterial.GOLD.getHarvestLevel());
+
 		Mekanism.configuration.save();
 		
 		//Registrations

src/main/resources/assets/mekanism/lang/fr_FR.lang

@@ -522,7 +522,7 @@ tooltip.seismicReader.noVibrations=Impossible de découvrir des vibrations
 
 tooltip.EnrichmentChamber=Une machine simple utilisée pour enrichir !nles minerais dans deux de leurs équivalents !nen poussière, aussi bien qu'exécuter beaucoup !nd'autres opérations.
 tooltip.OsmiumCompressor=Une machine assez avancée utilisée pour !ncomprimer l'osmium dans diverses poussières pour !ncréer leurs équivalents en lingot.
-tooltip.Combiner=A machine used to combine dusts and cobblestone !nto form their ore counterparts.
+tooltip.Combiner=Une machine utilisée pour combiner les poussières !net les pavés pour former leurs équivalents minerais.
 tooltip.Crusher=A machine used to crush ingots into their dust counterparts, !nas well as perform many other operations.
 tooltip.DigitalMiner=A highly-advanced, filter-based, auto-miner !nthat can mine whatever block you tell it to !nwithin a 32 block (max) radius.
 tooltip.BasicFactory=The lowest tier of the line of Factories, !nwhich can be used to process multiple !nmachine operations at once.
@@ -550,12 +550,12 @@ tooltip.PressurizedReactionChamber=An advanced machine that processes a !nsolid,
 tooltip.PortableTank=A handy, portable tank that lets you !ncarry 14 buckets of fluid wherever you !nplease. Also doubles as a bucket!
 tooltip.FluidicPlenisher=A machine that is capable of creating entire !nlakes by filling ravines with fluids.
 
-tooltip.HeatGenerator=A generator that uses the heat of lava or !nother burnable resources to produce energy.
+tooltip.HeatGenerator=Générateur qui utilise la chaleur de !nla lave ou d'autres ressources pour produire !nde l'énergie.
-tooltip.SolarGenerator=A generator that uses the power !nof the sun to produce energy.
+tooltip.SolarGenerator=Générateur qui utilise la puissance  !nsolaire pour produire de l'énergie.
-tooltip.GasGenerator=A generator that harnesses the molecular !nvarying gasses to produce energy.
+tooltip.GasGenerator=Générateur qui exploite le changement !nmoléculaire des gaz pour produire de l'énergie.
-tooltip.BioGenerator=A generator that burns organic materials of !nthe world to produce energy.
+tooltip.BioGenerator=Générateur qui brule les matériaux organiques !ndu monde pour produire de l'énergie.
-tooltip.AdvancedSolarGenerator=An advanced generator that directly !nabsorbs the sun's rays with little loss !nto produce energy.
+tooltip.AdvancedSolarGenerator=Générateur avancé qui absorbe directement !nles rayons solaire avec peu de pertes !npour produire de l'énergie..
-tooltip.WindTurbine=A generator that uses the strength of the wind !nto produce energy, with greater efficiency !nat higher levels.
+tooltip.WindTurbine=Générateur qui utilise la force du vent !pour produire de l'énergie, l'efficacité augmentant !naux niveaux les plus haut.
 
 tooltip.OsmiumOre=A strong mineral that can be found !nat nearly any height in the world. !nIt is known to have many uses in !nthe construction of machinery.
 tooltip.CopperOre=A common, conductive material that !ncan be used in the production of !nwires. Its ability to withstand !nhigh heats also makes it essential !nto advanced machinery.
@@ -733,4 +733,4 @@ item.SteelSword.name=Epée en acier
 //Config Gui
 mekanism.configgui.ctgy.tools.general.tooltip=Options concernant la configuration générale des 'MekanismTools' 
 mekanism.configgui.ctgy.tools.armor.tooltip=Options concernant les valeurs de protection et la balance des armures MekanismTools 
-mekanism.configgui.ctgy.tools.tools.tooltip=Options concernant les valeurs d'efficacité et la balance des ouitls MekanismTools
+mekanism.configgui.ctgy.tools.tools.tooltip=Options concernant les valeurs d'efficacité et la balance des outils MekanismTools

src/main/resources/assets/mekanism/lang/ja_JP.lang

@@ -10,9 +10,9 @@ item.AtomicAlloy.name=原子合金
 item.EnergyTablet.name=エネルギータブレット
 item.SpeedUpgrade.name=スピードアップグレード
 item.EnergyUpgrade.name=エネルギーアップグレード
-item.Robit.name=Robit
+item.Robit.name=ロビット
 item.AtomicDisassembler.name=原子分解機
-item.ElectricBow.name=Electric Bow
+item.ElectricBow.name=電気の弓
 item.EnrichedIron.name=精錬された鉄
 item.CompressedCarbon.name=圧縮カーボン
 item.CompressedRedstone.name=圧縮レッドストーン
@@ -22,7 +22,7 @@ item.PortableTeleporter.name=ポータブルテレポーター
 item.TeleportationCore.name=テレポーテーションコア
 item.Configurator.name=コンフィギュレーター
 item.NetworkReader.name=ネットワークリーダー
-item.WalkieTalkie.name=Walkie-Talkie
+item.WalkieTalkie.name=トランシーバー
 item.Jetpack.name=ジェットパック
 item.ScubaTank.name=スキューバタンク
 item.GasMask.name=ガスマスク
@@ -53,7 +53,7 @@ tile.GasTank.GasTank.name=ガスタンク
 tile.CardboardBox.name=ダンボール
 
 //Bounding Block
-tile.BoundingBlock.name=Bounding Block
+tile.BoundingBlock.name=跳ねているブロック
 
 //Salt
 tile.SaltBlock.name=塩ブロック
@@ -98,21 +98,21 @@ tile.MachineBlock.LogisticalSorter.name=ロジスティカルソーター
 tile.MachineBlock.DigitalMiner.name=デジタルマイナー
 
 //Machine Block 2 (second ID iteration)
-tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator
+tile.MachineBlock2.RotaryCondensentrator.name=液体物質変換機
 tile.MachineBlock2.ChemicalOxidizer.name=化学酸化機
 tile.MachineBlock2.ChemicalInfuser.name=化学注入機
-tile.MachineBlock2.ChemicalCombiner.name=Chemical Combiner
+tile.MachineBlock2.ChemicalCombiner.name=科学結合機
-tile.MachineBlock2.ChemicalInjectionChamber.name=Chemical Injection Chamber
+tile.MachineBlock2.ChemicalInjectionChamber.name=化学注入機
-tile.MachineBlock2.ElectrolyticSeparator.name=Electrolytic Separator
+tile.MachineBlock2.ElectrolyticSeparator.name=電解分離機
-tile.MachineBlock2.PrecisionSawmill.name=Precision Sawmill
+tile.MachineBlock2.PrecisionSawmill.name=精密製材
-tile.MachineBlock2.ChemicalDissolutionChamber.name=Chemical Dissolution Chamber
+tile.MachineBlock2.ChemicalDissolutionChamber.name=化学溶解機
-tile.MachineBlock2.ChemicalWasher.name=Chemical Washer
+tile.MachineBlock2.ChemicalWasher.name=化学洗浄機
-tile.MachineBlock2.ChemicalCrystallizer.name=Chemical Crystallizer
+tile.MachineBlock2.ChemicalCrystallizer.name=化学結晶化装置
-tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator
+tile.MachineBlock2.SeismicVibrator.name=耐震バイブレーター
-tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber
+tile.MachineBlock2.PressurizedReactionChamber.name=加圧反応機
 tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC
 tile.MachineBlock2.PortableTank.name=ポータブルタンク
-tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher
+tile.MachineBlock2.FluidicPlenisher.name=流体再供給機
 
 //Plastic
 tile.PlasticBlock.name=プラスチックブロック
@@ -125,11 +125,11 @@ tile.PlasticFence.name=プラスチックの柵
 
 //Infuse types
 infuse.carbon=カーボン
-infuse.tin=Tin
+infuse.tin=鈴
-infuse.diamond=Diamond
+infuse.diamond=ダイヤモンド
 infuse.redstone=レッドストーン
-infuse.fungi=Fungi
+infuse.fungi=菌
-infuse.obsidian=Obsidian
+infuse.obsidian=黒曜石
 
 //Ore Block
 tile.OreBlock.OsmiumOre.name=オスミウム鉱石
@@ -137,18 +137,18 @@ tile.OreBlock.CopperOre.name=銅鉱石
 tile.OreBlock.TinOre.name=スズ鉱石
 
 //Transmitters
-item.MultipartTransmitter.PressurizedTube.name=Pressurized Tube
+item.MultipartTransmitter.PressurizedTube.name=加圧チューブ
 item.MultipartTransmitter.BasicUniversalCable.name=ベーシックユニバーサルケーブル
 item.MultipartTransmitter.AdvancedUniversalCable.name=アドバンスドユニバーサルケーブル
 item.MultipartTransmitter.EliteUniversalCable.name=エリートユニバーサルケーブル
 item.MultipartTransmitter.UltimateUniversalCable.name=アルティメットユニバーサルケーブル
-item.MultipartTransmitter.BasicMechanicalPipe.name=Basic Mechanical Pipe
+item.MultipartTransmitter.BasicMechanicalPipe.name=基本メカニカルパイプ
-item.MultipartTransmitter.AdvancedMechanicalPipe.name=Advanced Mechanical Pipe
+item.MultipartTransmitter.AdvancedMechanicalPipe.name=発展メカニカルパイプ
-item.MultipartTransmitter.EliteMechanicalPipe.name=Elite Mechanical Pipe
+item.MultipartTransmitter.EliteMechanicalPipe.name=上級メカニカルパイプ
-item.MultipartTransmitter.UltimateMechanicalPipe.name=Ultimate Mechanical Pipe
+item.MultipartTransmitter.UltimateMechanicalPipe.name=究極メカニカルパイプ
-item.MultipartTransmitter.LogisticalTransporter.name=Logistical Transporter
+item.MultipartTransmitter.LogisticalTransporter.name=ロジスティカルトランスポーター
-item.MultipartTransmitter.RestrictiveTransporter.name=Restrictive Transporter
+item.MultipartTransmitter.RestrictiveTransporter.name=制限トランスポーター
-item.MultipartTransmitter.DiversionTransporter.name=Diversion Transporter
+item.MultipartTransmitter.DiversionTransporter.name=迂回トランスポーター
 
 //Glow Panel
 item.GlowPanel.name=グロウパネル
@@ -160,57 +160,57 @@ tile.EnergyCube.Elite.name=エリートエネルギーキューブ
 tile.EnergyCube.Ultimate.name=アルティメットエネルギーキューブ
 
 //Dust
-item.ironDust.name=Iron Dust
+item.ironDust.name=鉄の粉
-item.goldDust.name=Gold Dust
+item.goldDust.name=金の粉
-item.osmiumDust.name=Osmium Dust
+item.osmiumDust.name=オスミウムの粉
-item.obsidianDust.name=Refined Obsidian Dust
+item.obsidianDust.name=精製黒曜石の粉
-item.diamondDust.name=Diamond Dust
+item.diamondDust.name=ダイヤモンドの粉
-item.steelDust.name=Steel Dust
+item.steelDust.name=スチールの粉
-item.copperDust.name=Copper Dust
+item.copperDust.name=銅の粉
-item.tinDust.name=Tin Dust
+item.tinDust.name=鈴の粉
-item.silverDust.name=Silver Dust
+item.silverDust.name=銀の粉
-item.leadDust.name=Lead Dust
+item.leadDust.name=鉛の粉
-item.sulfurDust.name=Sulfur Dust
+item.sulfurDust.name=硫黄の粉
 
 //Clumps
-item.ironClump.name=Iron Clump
+item.ironClump.name=鉄の塊
-item.goldClump.name=Gold Clump
+item.goldClump.name=金の塊
-item.osmiumClump.name=Osmium Clump
+item.osmiumClump.name=オスミウムの塊
-item.copperClump.name=Copper Clump
+item.copperClump.name=銅の塊
-item.tinClump.name=Tin Clump
+item.tinClump.name=鈴の塊
-item.silverClump.name=Silver Clump
+item.silverClump.name=銀の塊
-item.obsidianClump.name=Obsidian Clump
+item.obsidianClump.name=黒曜石の塊
-item.leadClump.name=Lead Clump
+item.leadClump.name=鉛の塊
 
 //Shards
-item.ironShard.name=Iron Shard
+item.ironShard.name=鉄の破片
-item.goldShard.name=Gold Shard
+item.goldShard.name=金の破片
-item.osmiumShard.name=Osmium Shard
+item.osmiumShard.name=オスミウムの破片
-item.copperShard.name=Copper Shard
+item.copperShard.name=銅の破片
-item.tinShard.name=Tin Shard
+item.tinShard.name=鈴の破片
-item.silverShard.name=Silver Shard
+item.silverShard.name=銀の破片
-item.obsidianShard.name=Obsidian Shard
+item.obsidianShard.name=黒曜石の破片
-item.leadShard.name=Lead Shard
+item.leadShard.name=鉛の破片
 
 //Crystals
-item.ironCrystal.name=Iron Crystal
+item.ironCrystal.name=鉄の結晶
-item.goldCrystal.name=Gold Crystal
+item.goldCrystal.name=金の結晶
-item.osmiumCrystal.name=Osmium Crystal
+item.osmiumCrystal.name=オスミウムの結晶
-item.copperCrystal.name=Copper Crystal
+item.copperCrystal.name=銅の結晶
-item.tinCrystal.name=Tin Crystal
+item.tinCrystal.name=鈴の結晶
-item.silverCrystal.name=Silver Crystal
+item.silverCrystal.name=銀の結晶
-item.obsidianCrystal.name=Obsidian Crystal
+item.obsidianCrystal.name=黒曜石の結晶
-item.leadCrystal.name=Lead Crystal
+item.leadCrystal.name=鉛の結晶
 
 //Dirty Dust
-item.dirtyIronDust.name=Dirty Iron Dust
+item.dirtyIronDust.name=汚れた鉄の粉 (要翻訳検証)
-item.dirtyGoldDust.name=Dirty Gold Dust
+item.dirtyGoldDust.name=汚れた金の粉 (要翻訳検証)
-item.dirtyOsmiumDust.name=Dirty Osmium Dust
+item.dirtyOsmiumDust.name=汚れたオスミウムの粉 (要翻訳検証)
-item.dirtyCopperDust.name=Dirty Copper Dust
+item.dirtyCopperDust.name=汚れた銅の粉 (要翻訳検証)
-item.dirtyTinDust.name=Dirty Tin Dust
+item.dirtyTinDust.name=汚れた鈴の粉 (要翻訳検証)
-item.dirtySilverDust.name=Dirty Silver Dust
+item.dirtySilverDust.name=汚れた銀の粉 (要翻訳検証)
-item.dirtyObsidianDust.name=Dirty Obsidian Dust
+item.dirtyObsidianDust.name=汚れた黒曜石の粉 (要翻訳検証)
-item.dirtyLeadDust.name=Dirty Lead Dust
+item.dirtyLeadDust.name=汚れた鉛の粉 (要翻訳検証)
 
 //Ingots
 item.obsidianIngot.name=黒曜石のインゴット
@@ -222,53 +222,53 @@ item.copperIngot.name=銅インゴット
 item.tinIngot.name=スズインゴット
 
 //Gasses
-gas.hydrogen=Hydrogen
+gas.hydrogen=水素
-gas.oxygen=Oxygen
+gas.oxygen=酸素
-gas.water=Water Vapor
+gas.water=水蒸気
-gas.chlorine=Chlorine
+gas.chlorine=塩素
-gas.sulfurDioxideGas=Sulfur Dioxide
+gas.sulfurDioxideGas=二酸化硫黄
-gas.sulfurTrioxideGas=Sulfur Trioxide
+gas.sulfurTrioxideGas=三酸化硫黄
-gas.sulfuricAcid=Sulfuric Acid
+gas.sulfuricAcid=硫酸
-gas.hydrogenChloride=Hydrogen Chloride
+gas.hydrogenChloride=塩化水素
-gas.liquidOsmium=Liquid Osmium
+gas.liquidOsmium=リキッドオスミウム
-gas.liquidStone=Liquid Stone
+gas.liquidStone=リキッドストーン
-gas.ethene=Ethylene
+gas.ethene=エチレン
-gas.sodium=Sodium
+gas.sodium=ナトリウム
-gas.brine=Gaseous Brine
+gas.brine=ガス状の塩水 (要翻訳検証)
 
-gas.iron=Iron Slurry
+gas.iron=鉄のスラリー
-gas.gold=Gold Slurry
+gas.gold=金のスラリー
-gas.osmium=Osmium Slurry
+gas.osmium=オスミウムのスラリー
-gas.copper=Copper Slurry
+gas.copper=銅のスラリー
-gas.tin=Tin Slurry
+gas.tin=鈴のスラリー
-gas.silver=Silver Slurry
+gas.silver=銀のスラリー
-gas.obsidian=Obsidian Slurry
+gas.obsidian=黒曜石のスラリー
-gas.lead=Lead Slurry
+gas.lead=鉛のスラリー
 
-gas.cleanIron=Clean Iron Slurry
+gas.cleanIron=清潔な鉄のスラリー
-gas.cleanGold=Clean Gold Slurry
+gas.cleanGold=清潔な金のスラリー
-gas.cleanOsmium=Clean Osmium Slurry
+gas.cleanOsmium=清潔なオスミウムのスラリー
-gas.cleanCopper=Clean Copper Slurry
+gas.cleanCopper=清潔な銅のスラリー
-gas.cleanTin=Clean Tin Slurry
+gas.cleanTin=清潔な鈴のスラリー
-gas.cleanSilver=Clean Silver Slurry
+gas.cleanSilver=清潔な銀のスラリー
-gas.cleanObsidian=Clean Obsidian Slurry
+gas.cleanObsidian=清潔な黒曜石のスラリー
-gas.cleanLead=Clean Lead Slurry
+gas.cleanLead=清潔な鉛のスラリー
 
 //BC Fuel Gases
-gas.fuel=Vaporized Fuel
+gas.fuel=気化燃料
-gas.oil=Vaporized Oil
+gas.oil=気化油
 
 //Fluids
-fluid.hydrogen=Liquid Hydrogen
+fluid.hydrogen=液体水素
-fluid.oxygen=Liquid Oxygen
+fluid.oxygen=液体酸素
-fluid.chlorine=Liquid Chlorine
+fluid.chlorine=液体塩素
-fluid.sulfurDioxideGas=Liquid Sulfur Dioxide
+fluid.sulfurDioxideGas=液体亜硫酸
-fluid.sulfurTrioxideGas=Liquid Sulfur Trioxide
+fluid.sulfurTrioxideGas=三酸化液体硫黄
-fluid.sulfuricAcid=Liquid Sulfuric Acid
+fluid.sulfuricAcid=液体硫酸
-fluid.hydrogenChloride=Liquid Hydrogen Chloride
+fluid.hydrogenChloride=液体塩化水素
-fluid.brine=Brine
+fluid.brine=塩水
-fluid.ethene=Liquid Ethylene
+fluid.ethene=液体エチレン
-fluid.sodium=Liquid Sodium
+fluid.sodium=液体ナトリウム
 
 //OreGas names
 oregas.iron=鉄鉱石
@@ -277,246 +277,246 @@ oregas.osmium=オスミウム鉱石
 oregas.copper=銅鉱石
 oregas.tin=スズ鉱石
 oregas.silver=銀鉱石
-oregas.obsidian=Obsidian Ore
+oregas.obsidian=黒曜石鉱石
-oregas.lead=Lead Ore
+oregas.lead=鉛鉱石
 
 //Update handler text
-update.consider=Consider updating to version
+update.consider=バージョンの更新を検討
-update.newFeatures=New features
+update.newFeatures=新機能
 update.visit=Visit
-update.toDownload=to download
+update.toDownload=でダウンロード
-update.devBuild=Using developer build
+update.devBuild=開発版ビルドを利用中
-update.outdated=Using outdated version on one or more modules
+update.outdated=古いバージョンのモジュールを利用しています
 
 //Key description text
-key.mode=Mode Switch
+key.mode=モード切り替え
-key.voice=Voice
+key.voice=声
 
 //Config Gui
-mekanism.configgui.ctgy.general.tooltip=General settings regarding Mekanism and all its modules
+mekanism.configgui.ctgy.general.tooltip=Mekanism&モジュールの基本設定
-mekanism.configgui.ctgy.usage.tooltip=Settings regarding machinery and their energy usage
+mekanism.configgui.ctgy.usage.tooltip=機械に関する設定とエネルギー使用量
 
 //Gui text
-gui.removeSpeedUpgrade=Remove speed upgrade
+gui.removeSpeedUpgrade=スピードアップグレードを削除
-gui.removeEnergyUpgrade=Remove energy upgrade
+gui.removeEnergyUpgrade=エナジーアップグレードを削除
-gui.condensentrating=Condensentrating
+gui.condensentrating=コンデンセントレート中
-gui.decondensentrating=Decondensentrating
+gui.decondensentrating=デコンデンセントレート中
-gui.power=Power
+gui.power=パワー
-gui.confirm=Confirm
+gui.confirm=確認
-gui.open=Open
+gui.open=開く
-gui.allOK=All OK
+gui.allOK=全てOK
-gui.none=None
+gui.none=なし
-gui.new=New
+gui.new=新規
-gui.edit=Edit
+gui.edit=編集
-gui.save=Save
+gui.save=保存
-gui.output=Output
+gui.output=出力
-gui.delete=Delete
+gui.delete=削除
-gui.status=Status
+gui.status=状態
-gui.autoEject=Auto-eject
+gui.autoEject=自動取り出し
-gui.itemstack=ItemStack
+gui.itemstack=アイテム
-gui.oredict=OreDict
+gui.oredict=オアディクト
-gui.material=Material
+gui.material=マテリアル
-gui.out=Out
+gui.out=出
-gui.noFluid=No fluid
+gui.noFluid=非液体
-gui.empty=Empty
+gui.empty=空
-gui.volume=Volume
+gui.volume=ボリューム
-gui.start=Start
+gui.start=スタート
-gui.stop=Stop
+gui.stop=ストップ
-gui.config=Config
+gui.config=設定
-gui.teleport=Teleport
+gui.teleport=テレポート
-gui.eject=Eject
+gui.eject=取り出し
-gui.input=Input
+gui.input=入力
-gui.slots=Slots
+gui.slots=スロット
-gui.state=State
+gui.state=状態
-gui.on=On
+gui.on=オン
-gui.off=Off
+gui.off=オフ
-gui.filters=Filters
+gui.filters=フィルター
-gui.idle=Idle
+gui.idle=アイドル
-gui.data=Data
+gui.data=データ
-gui.newFilter=New Filter
+gui.newFilter=新規フィルター
-gui.energy=Energy
+gui.energy=エナジー
-gui.gas=Gas
+gui.gas=ガス
-gui.dumping=Dumping
+gui.dumping=廃棄中
-gui.dumping_excess=Dumping Excess
+gui.dumping_excess=廃棄過剰
 gui.modID=Mod ID
-gui.key=Key
+gui.key=キー
 gui.id=ID
-gui.finished=Finished
+gui.finished=完了
 
-gui.chemicalInfuser.short=C. Infuser
+gui.chemicalInfuser.short=C. 注入器
-gui.chemicalDissolutionChamber.short=C. Dissolution Chamber
+gui.chemicalDissolutionChamber.short=C. 溶解機
 
-gui.dictionary.noKey=No key.
+gui.dictionary.noKey=No キー.
 
-gui.configuration=Configuration
+gui.configuration=設定
-gui.configuration.strictInput=Strict Input
+gui.configuration.strictInput=厳密な入力
 
-gui.rotaryCondensentrator.toggleOperation=Toggle operation
+gui.rotaryCondensentrator.toggleOperation=切り替え操作
 
-gui.factory.secondaryEnergy=Secondary energy
+gui.factory.secondaryEnergy=二次エネルギー
-gui.factory.smelting=Smelting
+gui.factory.smelting=精錬中
-gui.factory.enriching=Enriching
+gui.factory.enriching=肥やしています(要検証翻訳)
-gui.factory.crushing=Crushing
+gui.factory.crushing=粉砕中
-gui.factory.compressing=Compressing
+gui.factory.compressing=圧縮中
-gui.factory.combining=Combining
+gui.factory.combining=結合中
-gui.factory.purifying=Purifying
+gui.factory.purifying=浄化中
-gui.factory.injecting=Injecting
+gui.factory.injecting=注入中
-gui.factory.autoSort=Auto-sort
+gui.factory.autoSort=自動ソート
 
-gui.seismicReader.short=S. Reader
+gui.seismicReader.short=S. レーダー
-gui.seismicReader.solids=Solids
+gui.seismicReader.solids=ソリッド
 gui.seismicReader.fluids=Fluids
-gui.seismicReader.reading=Reading
+gui.seismicReader.reading=読み込み中
 
-gui.filterSelect.title=Create New Filter
+gui.filterSelect.title=新規フィルターを作成
 
-gui.oredictFilter=OreDict Filter
+gui.oredictFilter=オアディクトフィルター
-gui.oredictFilter.noKey=No key
+gui.oredictFilter.noKey=No キー
-gui.oredictFilter.sameKey=Same key
+gui.oredictFilter.sameKey=同じキー
 
-gui.modIDFilter=Mod ID Filter
+gui.modIDFilter=Mod ID フィルター
 gui.modIDFilter.noID=No ID
-gui.modIDFilter.sameID=Same ID
+gui.modIDFilter.sameID=同じ ID
 
-gui.itemFilter=Item Filter
+gui.itemFilter=アイテムフィルター
-gui.itemFilter.noItem=No item
+gui.itemFilter.noItem=No アイテム
-gui.itemFilter.details=ItemStack Details
+gui.itemFilter.details=ItemStack詳細
-gui.itemFilter.min=Min
+gui.itemFilter.min=最小
-gui.itemFilter.max=Max
+gui.itemFilter.max=最大
 
-gui.materialFilter=Material Filter
+gui.materialFilter=マテリアルフィルター
-gui.materialFilter.details=Using material of
+gui.materialFilter.details=マテリアルを使用中の
 
-gui.portableTeleporter=Portable Teleporter
+gui.portableTeleporter=ポータブルテレポーター
 
-gui.robit=Robit
+gui.robit=ロビット
-entity.Robit.name=Robit
+entity.Robit.name=ロビット
-gui.robit.smelting=Robit Smelting
+gui.robit.smelting=ロビット 精錬中
-gui.robit.inventory=Robit Inventory
+gui.robit.inventory=ロビット インベントリ
-gui.robit.crafting=Robit Crafting
+gui.robit.crafting=ロビット クラフト中
-gui.robit.greeting=Hi, I'm
+gui.robit.greeting=こんにちは！私は
-gui.robit.toggleFollow=Toggle 'follow' mode
+gui.robit.toggleFollow=フォローモードに切り替え
-gui.robit.rename=Rename this Robit
+gui.robit.rename=このロビットの名前を変更
-gui.robit.teleport=Teleport back home
+gui.robit.teleport=家にテレポートして戻る
-gui.robit.togglePickup=Toggle 'drop pickup' mode
+gui.robit.togglePickup=アイテム回収モードに切り替え
-gui.robit.following=Following
+gui.robit.following=フォロー中
 gui.robit.dropPickup=ドロップ回収
 gui.robit.owner=オーナー
 
-gui.password.setPassword=Set password
+gui.password.setPassword=パスワードを設定
-gui.password.enterPassword=Enter password
+gui.password.enterPassword=パスワードを入力
-gui.password.fieldsEmpty=Field(s) empty
+gui.password.fieldsEmpty=入力欄が空です
-gui.password.notMatching=Not matching
+gui.password.notMatching=パスワードが同じになっていません
-gui.password.identical=Identical
+gui.password.identical=同じ
-gui.password.invalid=Invalid
+gui.password.invalid=無効
-gui.password=Password
+gui.password=パスワード
 
-gui.logisticalSorter.default=Default
+gui.logisticalSorter.default=デフォルト
-gui.logisticalSorter.auto=Auto
+gui.logisticalSorter.auto=自動
 gui.logisticalSorter.roundRobin=Round-robin
 
-gui.electricChest.editPassword=Edit Password
+gui.electricChest.editPassword=パスワード編集
 
-gui.teleporter.notReady=Not ready
+gui.teleporter.notReady=準備が出来ていません
-gui.teleporter.ready=Ready
+gui.teleporter.ready=準備完了
-gui.teleporter.noFrame=No frame
+gui.teleporter.noFrame=No フレーム
-gui.teleporter.noLink=No link
+gui.teleporter.noLink=接続できません
-gui.teleporter.exceeds=Links > 2
+gui.teleporter.exceeds=リンク > 2
-gui.teleporter.needsEnergy=Needs energy
+gui.teleporter.needsEnergy=必要なエネルギー
 
-gui.digitalMinerConfig=Digital Miner Config
+gui.digitalMinerConfig=デジタルマイナー 設定
 
-gui.digitalMiner.autoPull=Auto-pull
+gui.digitalMiner.autoPull=自動取り出し
-gui.digitalMiner.replaceBlock=Replace block
+gui.digitalMiner.replaceBlock=ブロック置換
 gui.digitalMiner.reset=リセット
 gui.digitalMiner.silkTouch=シルクタッチ
-gui.digitalMiner.pull=Pull
+gui.digitalMiner.pull=取り出し
-gui.digitalMiner.silk=Silk
+gui.digitalMiner.silk=シルクタッチ
-gui.digitalMiner.toMine=To mine
+gui.digitalMiner.toMine=残りブロック数
 gui.digitalMiner.running=採掘中
-gui.digitalMiner.inverse=Inverse mode
+gui.digitalMiner.inverse=逆モード
 
 //Recipe names
-recipe.mekanismShaped=Shaped
+recipe.mekanismShaped=整形
 
 //Item and block tooltip text
-tooltip.configurator.configurate=Configurate
+tooltip.configurator.configurate=設定
-tooltip.configurator.empty=Empty
+tooltip.configurator.empty=空
-tooltip.configurator.rotate=Rotate
+tooltip.configurator.rotate=回転
-tooltip.configurator.wrench=Wrench
+tooltip.configurator.wrench=レンチ
-tooltip.configurator.pumpReset=Reset Electric Pump calculation
+tooltip.configurator.pumpReset=電動ポンプ計算をリセット
-tooltip.configurator.toggleDiverter=Diverter mode changed to
+tooltip.configurator.toggleDiverter=分流モードを変更:
-tooltip.configurator.toggleColor=Color bumped to
+tooltip.configurator.toggleColor=カラーバンプ(要検証翻訳):
-tooltip.configurator.viewColor=Current color
+tooltip.configurator.viewColor=現在の色
-tooltip.configurator.unauth=This chest is locked
+tooltip.configurator.unauth=このチェストはロック済み
-tooltip.configurator.noLink=No link
+tooltip.configurator.noLink=未接続
-tooltip.configurator.linkMsg=Bound to
+tooltip.configurator.linkMsg=跳ねる(要翻訳検証):
-tooltip.configurator.dim=dimension
+tooltip.configurator.dim=ディメンション
-tooltip.configurator.setLink=Set link to block
+tooltip.configurator.setLink=ブロックにリンクを指定
-tooltip.configurator.plenisherReset=Reset Fluidic Plenisher calculation
+tooltip.configurator.plenisherReset=流体再供給機の計算をリセット
 
 tooltip.upgrade.speed=スピード
 tooltip.upgrade.energy=エネルギー
 
 tooltip.inventory=インベントリ
-tooltip.storedEnergy=Stored energy
+tooltip.storedEnergy=蓄積エネルギー
-tooltip.auth=Authenticated
+tooltip.auth=認証済み
-tooltip.locked=Locked
+tooltip.locked=ロック済み
-tooltip.recipeType=Recipe type
+tooltip.recipeType=レシピタイプ
-tooltip.hold=Hold
+tooltip.hold=ホールド
-tooltip.forDesc=for a description
+tooltip.forDesc=説明
-tooltip.forDetails=for details
+tooltip.forDetails=詳細
-tooltip.fireMode=Fire Mode
+tooltip.fireMode=ファイヤーモード
-tooltip.capacity=Capacity
+tooltip.capacity=容量
-tooltip.pumpRate=Pump Rate
+tooltip.pumpRate=ポンプ速度
 tooltip.items=アイテム
 tooltip.blocks=ブロック
-tooltip.universal=universal
+tooltip.universal=ユニバーサル
-tooltip.fluids=Fluids
+tooltip.fluids=流体
-tooltip.gasses=Gasses
+tooltip.gasses=ガス
-tooltip.capableTrans=Capable of transferring
+tooltip.capableTrans=転送可能な
-tooltip.restrictiveDesc=Only used if no other paths available
+tooltip.restrictiveDesc=他のパスが可能な場合にのみ使用します
-tooltip.diversionDesc=Controllable by redstone
+tooltip.diversionDesc=レッドストーンで制御可能
-tooltip.noGas=No gas stored
+tooltip.noGas=ガスは保存されていません
-tooltip.stored=Stored
+tooltip.stored=保存済み
-tooltip.channel=Channel
+tooltip.channel=チャンネル
-tooltip.mode=Mode
+tooltip.mode=モード
-tooltip.efficiency=Efficiency
+tooltip.efficiency=効率
-tooltip.modeToggle=Mode toggled to
+tooltip.modeToggle=モード切り替え:
-tooltip.flowing=Flowing
+tooltip.flowing=流れる
-tooltip.yes=yes
+tooltip.yes=はい
-tooltip.no=no
+tooltip.no=いいえ
-tooltip.name=Name
+tooltip.name=名前
-tooltip.blockData=Block data
+tooltip.blockData=ブロックデータ
-tooltip.block=Block
+tooltip.block=ブロック
-tooltip.meta=Metadata
+tooltip.meta=メタデータ
-tooltip.tile=Tile
+tooltip.tile=タイル
-tooltip.keysFound=Key(s) found
+tooltip.keysFound=キー発見
-tooltip.noKey=No key
+tooltip.noKey=No キー
 tooltip.hp=HP
-tooltip.configureState=Configure State
+tooltip.configureState=設定状態
 
-tooltip.portableTank.bucketMode=Bucket Mode
+tooltip.portableTank.bucketMode=バケツモード
 
-tooltip.disassembler.normal=normal
+tooltip.disassembler.normal=通常
-tooltip.disassembler.slow=slow
+tooltip.disassembler.slow=遅い
-tooltip.disassembler.fast=fast
+tooltip.disassembler.fast=早い
-tooltip.disassembler.vein=vein
+tooltip.disassembler.vein=静脈
-tooltip.disassembler.off=off
+tooltip.disassembler.off=オフ
 
-tooltip.filterCard.got=Retrieved filter data from %s
+tooltip.filterCard.got=%s から取得したフィルタデータ
-tooltip.filterCard.set=Injected filter data of type %s
+tooltip.filterCard.set=タイプ %s の注入されたフィルタデータ
-tooltip.filterCard.unequal=Unequal filter data formats
+tooltip.filterCard.unequal=フィルタデータと形式が合いません
-tooltip.filterCard.logisticalSorter=Logistical Sorter
+tooltip.filterCard.logisticalSorter=物流ソーター
-tooltip.filterCard.digitalMiner=Digital Miner
+tooltip.filterCard.digitalMiner=デジタルマイナー
 
-tooltip.balloon=Balloon
+tooltip.balloon=バルーン
 
-tooltip.jetpack.regular=Regular
+tooltip.jetpack.regular=レギュラー
-tooltip.jetpack.hover=Hover
+tooltip.jetpack.hover=ホバー
-tooltip.jetpack.disabled=Disabled
+tooltip.jetpack.disabled=無効
 
-tooltip.seismicReader.needsEnergy=Not enough energy to interpret vibration
+tooltip.seismicReader.needsEnergy=エネルギー不足 to interpret vibration
 tooltip.seismicReader.noVibrations=Unable to discover any vibrations
 
 tooltip.EnrichmentChamber=A simple machine used to enrich ores into !ntwo of their dust counterparts, as well as !nperform many other operations.
@@ -562,63 +562,63 @@ tooltip.TinOre=A lightweight, yet sturdy, conductive !nmaterial that is found sl
 
 //Redstone control
 control.disabled=無効
-control.high=High
+control.high=高
-control.low=Low
+control.low=低
 control.disabled.desc=常にオン
-control.high.desc=Active with signal
+control.high.desc=アクティブ(信号)
-control.low.desc=Active without signal
+control.low.desc=アクティブ(未信号)
 
 //Container edit modes
-fluidedit.both=Both
+fluidedit.both=両方
-fluidedit.fill=Fill
+fluidedit.fill=埋める
-fluidedit.empty=Empty
+fluidedit.empty=空
 
 //Colors
-color.black=Black
+color.black=ブラック
-color.darkBlue=Dark Blue
+color.darkBlue=ダークブルー
-color.darkGreen=Dark Green
+color.darkGreen=ダークグリーン
-color.darkAqua=Dark Aqua
+color.darkAqua=ダークアクア
-color.darkRed=Dark Red
+color.darkRed=ダークレッド
-color.purple=Purple
+color.purple=パープル
-color.orange=Orange
+color.orange=オレンジ
-color.grey=Grey
+color.grey=グレー
-color.darkGrey=Dark Grey
+color.darkGrey=ダークグレー
-color.indigo=Indigo
+color.indigo=インディゴ
-color.brightGreen=Bright Green
+color.brightGreen=明るいグリーン
-color.aqua=Aqua
+color.aqua=アクア
-color.red=Red
+color.red=レッド
-color.pink=Pink
+color.pink=ピンク
-color.yellow=Yellow
+color.yellow=イエロー
-color.white=White
+color.white=ホワイト
-color.brown=Brown
+color.brown=ブラウン
-color.brightPink=Bright Pink
+color.brightPink=明るいピンク
 
 //Dyes
-dye.black=Black
+dye.black=ブラック
-dye.darkBlue=Blue
+dye.darkBlue=ブルー
-dye.brown=Brown
+dye.brown=ブラウン
-dye.darkGreen=Green
+dye.darkGreen=グリーン
-dye.darkAqua=Cyan
+dye.darkAqua=シアン
-dye.darkRed=Dark Red
+dye.darkRed=ダークレッド
-dye.purple=Purple
+dye.purple=パープル
-dye.orange=Orange
+dye.orange=オレンジ
-dye.grey=Light Grey
+dye.grey=ライトグレー
-dye.darkGrey=Grey
+dye.darkGrey=グレー
-dye.indigo=Light Blue
+dye.indigo=ライトブルー
-dye.brightGreen=Lime
+dye.brightGreen=ライム
-dye.aqua=Aqua
+dye.aqua=アクア
-dye.red=Red
+dye.red=レッド
-dye.brightPink=Pink
+dye.brightPink=ピンク
-dye.pink=Magenta
+dye.pink=マゼンタ
-dye.yellow=Yellow
+dye.yellow=イエロー
-dye.white=White
+dye.white=ホワイト
 
 //Creative tab
 itemGroup.tabMekanism=Mekanism
 
 //NEI stuff
-nei.chemicalInjectionChamber=C. Injection Chamber
+nei.chemicalInjectionChamber=C. 注入器
-nei.rotaryCondensentrator=R. Condensentrator
+nei.rotaryCondensentrator=R. コンデンセントレーター
 
 //**********//
 //GENERATORS//
@@ -643,7 +643,7 @@ tile.Generator.WindTurbine.name=風力発電機
 gui.heatGenerator.fuel=燃料
 gui.solarGenerator.sun=日光
 gui.bioGenerator.bioFuel=バイオ燃料
-gui.electrolyticSeparator.dump=Dump
+gui.electrolyticSeparator.dump=廃棄
 
 //*****//
 //TOOLS//
@@ -731,4 +731,4 @@ item.SteelSword.name=鋼鉄の剣
 //Config Gui
 mekanism.configgui.ctgy.tools.general.tooltip=Settings regarding MekanismTools' general configuration
 mekanism.configgui.ctgy.tools.armor.tooltip=Settings regarding the protection values and balance of MekanismTools armor sets
-mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanismTools tool sets
+mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanismTools tool sets