Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Brian Lewis 2014-12-18 08:50:53 -06:00
commit b95836e6be
14 changed files with 581 additions and 383 deletions

View file

@ -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.");
}

View file

@ -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));
}

View file

@ -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();

View file

@ -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;
}
}

View file

@ -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;
}
}

View file

@ -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;
}

View file

@ -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 {

View file

@ -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);
}
}

View file

@ -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()

View file

@ -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));
}
/**

View file

@ -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;
}
}

View file

@ -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());
StonePaxel.setHarvestLevel("paxel", ToolMaterial.STONE.getHarvestLevel());
IronPaxel.setHarvestLevel("paxel", ToolMaterial.IRON.getHarvestLevel());
DiamondPaxel.setHarvestLevel("paxel", ToolMaterial.EMERALD.getHarvestLevel());
GoldPaxel.setHarvestLevel("paxel", ToolMaterial.GOLD.getHarvestLevel());
WoodPaxel.setHarvestLevel("pickaxe", ToolMaterial.WOOD.getHarvestLevel());
WoodPaxel.setHarvestLevel("axe", ToolMaterial.WOOD.getHarvestLevel());
WoodPaxel.setHarvestLevel("shovel", ToolMaterial.WOOD.getHarvestLevel());
StonePaxel.setHarvestLevel("pickaxe", ToolMaterial.STONE.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

View file

@ -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.SolarGenerator=A generator that uses the power !nof the sun to produce energy.
tooltip.GasGenerator=A generator that harnesses the molecular !nvarying gasses to produce energy.
tooltip.BioGenerator=A generator that burns organic materials of !nthe world to produce energy.
tooltip.AdvancedSolarGenerator=An advanced generator that directly !nabsorbs the sun's rays with little loss !nto produce energy.
tooltip.WindTurbine=A generator that uses the strength of the wind !nto produce energy, with greater efficiency !nat higher levels.
tooltip.HeatGenerator=Générateur qui utilise la chaleur de !nla lave ou d'autres ressources pour produire !nde l'énergie.
tooltip.SolarGenerator=Générateur qui utilise la puissance !nsolaire pour produire de l'énergie.
tooltip.GasGenerator=Générateur qui exploite le changement !nmoléculaire des gaz pour produire de l'énergie.
tooltip.BioGenerator=Générateur qui brule les matériaux organiques !ndu monde pour produire de l'énergie.
tooltip.AdvancedSolarGenerator=Générateur avancé qui absorbe directement !nles rayons solaire avec peu de pertes !npour produire de l'énergie..
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

View file

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