From 0872cdbf04c88eb6319b1f6597d491ebf4bfb236 Mon Sep 17 00:00:00 2001 From: Mierzen Date: Sun, 13 Jul 2014 13:11:00 +0200 Subject: [PATCH 1/4] Update en_GB, add en_ZA --- .../resources/assets/mekanism/lang/en_GB.lang | 733 +++++++++++++++++- .../resources/assets/mekanism/lang/en_ZA.lang | 730 +++++++++++++++++ 2 files changed, 1455 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/mekanism/lang/en_ZA.lang diff --git a/src/main/resources/assets/mekanism/lang/en_GB.lang b/src/main/resources/assets/mekanism/lang/en_GB.lang index e7b94c275..9b580066f 100644 --- a/src/main/resources/assets/mekanism/lang/en_GB.lang +++ b/src/main/resources/assets/mekanism/lang/en_GB.lang @@ -1,13 +1,730 @@ +//********// +//MEKANISM// +//********// + +//Items +tile.ObsidianTNT.name=Obsidian TNT +item.EnrichedAlloy.name=Enriched Alloy +item.ReinforcedAlloy.name=Reinforced Alloy +item.AtomicAlloy.name=Atomic Alloy +item.EnergyTablet.name=Energy Tablet +item.SpeedUpgrade.name=Speed Upgrade +item.EnergyUpgrade.name=Energy Upgrade +item.Robit.name=Robit +item.AtomicDisassembler.name=Atomic Disassembler +item.ElectricBow.name=Electric Bow +item.EnrichedIron.name=Enriched Iron +item.CompressedCarbon.name=Compressed Carbon +item.CompressedRedstone.name=Compressed Redstone +item.CompressedDiamond.name=Compressed Diamond +item.CompressedObsidian.name=Compressed Obsidian +item.PortableTeleporter.name=Portable Teleporter +item.TeleportationCore.name=Teleportation Core +item.Configurator.name=Configurator +item.NetworkReader.name=Network Reader +item.WalkieTalkie.name=Walkie-Talkie +item.Jetpack.name=Jetpack +item.ScubaTank.name=Scuba Tank +item.GasMask.name=Gas Mask +item.Dictionary.name=Dictionary +item.ElectrolyticCore.name=Electrolytic Core +item.Sawdust.name=Sawdust +item.Salt.name=Salt +item.BrineBucket.name=Brine Bucket +item.FreeRunners.name=Free Runners +item.ArmoredJetpack.name=Armored Jetpack +item.FilterCard.name=Filter Card +item.SeismicReader.name=Seismic Reader +item.HDPEPellet.name=HDPE Pellet +item.HDPERod.name=HDPE Rod +item.HDPESheet.name=HDPE Sheet +item.PlaStick.name=PlaStick +item.Substrate.name=Substrate + +//Control Circuits +item.BasicControlCircuit.name=Basic Control Circuit +item.AdvancedControlCircuit.name=Advanced Control Circuit +item.EliteControlCircuit.name=Elite Control Circuit +item.UltimateControlCircuit.name=Ultimate Control Circuit + +//Gas Tank +tile.GasTank.GasTank.name=Gas Tank + +//Cardboard Box +tile.CardboardBox.name=Cardboard Box + +//Bounding Block +tile.BoundingBlock.name=Bounding Block + +//Salt +tile.SaltBlock.name=Salt Block + +//Basic Block +tile.BasicBlock.OsmiumBlock.name=Osmium Block +tile.BasicBlock.BronzeBlock.name=Bronze Block +tile.BasicBlock.RefinedObsidian.name=Refined Obsidian +tile.BasicBlock.CharcoalBlock.name=Charcoal Block +tile.BasicBlock.RefinedGlowstone.name=Refined Glowstone +tile.BasicBlock.SteelBlock.name=Steel Block +tile.BasicBlock.Bin.name=Bin +tile.BasicBlock.TeleporterFrame.name=Teleporter Frame +tile.BasicBlock.SteelCasing.name=Steel Casing +tile.BasicBlock.DynamicTank.name=Dynamic Tank +tile.BasicBlock.DynamicGlass.name=Dynamic Glass +tile.BasicBlock.DynamicValve.name=Dynamic Valve +tile.BasicBlock.CopperBlock.name=Copper Block +tile.BasicBlock.TinBlock.name=Tin Block +tile.BasicBlock.SalinationController.name=Salination Controller +tile.BasicBlock.SalinationValve.name=Salination Valve + +//Basic Block 2 (second ID iteration) +tile.BasicBlock2.SalinationBlock.name=Salination Block + +//Machine Block +tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber +tile.MachineBlock.OsmiumCompressor.name=Osmium Compressor +tile.MachineBlock.Combiner.name=Combiner +tile.MachineBlock.Crusher.name=Crusher +tile.MachineBlock.BasicFactory.name=Basic Factory +tile.MachineBlock.AdvancedFactory.name=Advanced Factory +tile.MachineBlock.EliteFactory.name=Elite Factory +tile.MachineBlock.MetallurgicInfuser.name=Metallurgic Infuser +tile.MachineBlock.PurificationChamber.name=Purification Chamber tile.MachineBlock.EnergizedSmelter.name=Energised Smelter -tile.Transmitter.PressurizedTube.name=Pressurised Tube +tile.MachineBlock.Teleporter.name=Teleporter +tile.MachineBlock.ElectricPump.name=Electric Pump +tile.MachineBlock.ElectricChest.name=Electric Chest +tile.MachineBlock.Chargepad.name=Chargepad +tile.MachineBlock.LogisticalSorter.name=Logistical Sorter +tile.MachineBlock.DigitalMiner.name=Digital Miner + +//Machine Block 2 (second ID iteration) +tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator tile.MachineBlock2.ChemicalOxidizer.name=Chemical Oxidiser +tile.MachineBlock2.ChemicalInfuser.name=Chemical Infuser +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 Crystalliser +tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator +tile.MachineBlock2.PressurizedReactionChamber.name=Pressurised Reaction Chamber +tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC +tile.MachineBlock2.PortableTank.name=Portable Tank +tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher + +//Plastic +tile.PlasticBlock.name=Plastic Block +tile.SlickPlasticBlock.name=Slick Plastic Block +tile.GlowPlasticBlock.name=Plastic Glow Block +tile.ReinforcedPlasticBlock.name=Reinforced Plastic Block +tile.RoadPlasticBlock.name=Plastic Road + +tile.PlasticFence.name=Plastic Barrier + +//Infuse types +infuse.carbon=Carbon +infuse.tin=Tin +infuse.diamond=Diamond +infuse.redstone=Redstone +infuse.fungi=Fungi +infuse.obsidian=Obsidian + +//Ore Block +tile.OreBlock.OsmiumOre.name=Osmium Ore +tile.OreBlock.CopperOre.name=Copper Ore +tile.OreBlock.TinOre.name=Tin Ore + item.MultipartTransmitter.PressurizedTube.name=Pressurised Tube -item.sulfurDust.name=Sulphur Dust +item.MultipartTransmitter.BasicUniversalCable.name=Basic Universal Cable +item.MultipartTransmitter.AdvancedUniversalCable.name=Advanced Universal Cable +item.MultipartTransmitter.EliteUniversalCable.name=Elite Universal Cable +item.MultipartTransmitter.UltimateUniversalCable.name=Ultimate Universal Cable +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 + +//Glow Panel +item.GlowPanel.name=Glow Panel + +//Energy Cubes +tile.EnergyCube.Basic.name=Basic Energy Cube +tile.EnergyCube.Advanced.name=Advanced Energy Cube +tile.EnergyCube.Elite.name=Elite Energy Cube +tile.EnergyCube.Ultimate.name=Ultimate Energy Cube + +//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 + +//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 + +//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 + +//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 + +//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 + +//Ingots +item.obsidianIngot.name=Obsidian Ingot +item.osmiumIngot.name=Osmium Ingot +item.bronzeIngot.name=Bronze Ingot +item.glowstoneIngot.name=Glowstone Ingot +item.steelIngot.name=Steel Ingot +item.copperIngot.name=Copper Ingot +item.tinIngot.name=Tin Ingot + +//Gasses +gas.hydrogen=Hydrogen +gas.oxygen=Oxygen gas.water=Water Vapour -gas.sulfurDioxideGas=Sulphur Dioxide -gas.sulfurTrioxideGas=Sulphur Trioxide -gas.sulfuricAcid=Sulphuric Acid -fluid.sulfurDioxideGas=Liquid Sulphur Dioxide -fluid.sulfurTrioxideGas=Liquid Sulphur Trioxide -fluid.sulfuricAcid=Liquid Sulphuric Acid +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.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.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 + +//BC Fuel Gases +gas.fuel=Vaporised Fuel +gas.oil=Vaporised 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 + +//OreGas names +oregas.iron=Iron Ore +oregas.gold=Gold Ore +oregas.osmium=Osmium Ore +oregas.copper=Copper Ore +oregas.tin=Tin Ore +oregas.silver=Silver Ore +oregas.obsidian=Obsidian Ore +oregas.lead=Lead Ore + +//Update handler text +update.consider=Consider updating to version +update.newFeatures=New features +update.visit=Visit +update.toDownload=to download +update.devBuild=Using developer build +update.outdated=Using outdated version on one or more modules + +//Key description text +key.mode=Mode Switch +key.voice=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 + +//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.modID=Mod ID +gui.key=Key +gui.id=ID +gui.finished=Finished + +gui.chemicalInfuser.short=C. Infuser +gui.chemicalDissolutionChamber.short=C. Dissolution Chamber + +gui.dictionary.noKey=No key. + +gui.configuration=Configuration +gui.configuration.strictInput=Strict Input + +gui.rotaryCondensentrator.toggleOperation=Toggle operation + +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.seismicReader.short=S. Reader +gui.seismicReader.solids=Solids +gui.seismicReader.fluids=Fluids +gui.seismicReader.reading=Reading + +gui.filterSelect.title=Create New Filter + +gui.oredictFilter=OreDict Filter +gui.oredictFilter.noKey=No key entered +gui.oredictFilter.sameKey=Same key + +gui.modIDFilter=Mod ID Filter +gui.modIDFilter.noID=No ID entered +gui.modIDFilter.sameID=Same ID + +gui.itemFilter=Item Filter +gui.itemFilter.noItem=No item +gui.itemFilter.details=ItemStack Details +gui.itemFilter.min=Min +gui.itemFilter.max=Max + +gui.materialFilter=Material Filter +gui.materialFilter.details=Using material of + +gui.portableTeleporter=Portable Teleporter + +gui.teleporter.notReady=Not Ready +gui.teleporter.ready=Ready +gui.teleporter.needsEnergy=Needs energy +gui.teleporter.linksCapacity=Links > 2 +gui.teleporter.noLink=No link found + +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.dropPickup=Drop pickup +gui.robit.owner=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.logisticalSorter.default=Default +gui.logisticalSorter.auto=Auto +gui.logisticalSorter.roundRobin=Round-robin + +gui.electricChest.editPassword=Edit Password + +gui.digitalMinerConfig=Digital Miner Config + +gui.digitalMiner.autoPull=Auto-pull +gui.digitalMiner.replaceBlock=Replace block +gui.digitalMiner.reset=Reset +gui.digitalMiner.silkTouch=Silk touch +gui.digitalMiner.pull=Pull +gui.digitalMiner.silk=Silk +gui.digitalMiner.toMine=To mine +gui.digitalMiner.running=Running +gui.digitalMiner.inverse=Inverse mode + +//Recipe names +recipe.mekanismShaped=Shaped + +//Item and block tooltip text +tooltip.configurator.modify=Modify +tooltip.configurator.empty=Empty +tooltip.configurator.wrench=Wrench +tooltip.configurator.link=Link +tooltip.configurator.pumpReset=Reset Electric Pump calculation +tooltip.configurator.toggleDiverter=Diverter mode changed to +tooltip.configurator.toggleColor=Colour bumped to +tooltip.configurator.viewColor=Current colour +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.upgrade.speed=Speed +tooltip.upgrade.energy=Energy + +tooltip.inventory=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.items=Items +tooltip.blocks=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.hp=HP +tooltip.configureState=Configure State + +tooltip.portableTank.bucketMode=Bucket Mode + +tooltip.disassembler.normal=normal +tooltip.disassembler.slow=slow +tooltip.disassembler.fast=fast +tooltip.disassembler.vein=vein +tooltip.disassembler.off=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.balloon=Balloon + +tooltip.jetpack.regular=Regular +tooltip.jetpack.hover=Hover +tooltip.jetpack.disabled=Disabled + +tooltip.seismicReader.needsEnergy=Not enough energy 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. +tooltip.OsmiumCompressor=A fairly advanced machine used to compress !nosmium into various dusts in order to create !ntheir ingot counterparts. +tooltip.Combiner=A machine used to combine dusts and cobblestone to !nform their ore counterparts. +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 that can !nmine whatever block you tell it to within !na 32 block (max) radius. +tooltip.BasicFactory=The lowest tier of the line of Factories, which can !nbe used to process multiple machine operations !nat once. +tooltip.AdvancedFactory=The middle tier of the line of Factories, which can !nbe used to process multiple machine !noperations at once. +tooltip.EliteFactory=The highest tier of the line of Factories, which can !nbe used to process multiple machine !noperations at once. +tooltip.MetallurgicInfuser=A machine used to infuse various materials !ninto (generally) metals to create metal alloys !nand other compounds. +tooltip.PurificationChamber=An advanced machine capable of processing !nores into three clumps, serving as the initial !nstage of 300% ore processing. +tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based !nfurnace that runs off of energy. +tooltip.Teleporter=A machine capable of teleporting players to various !nlocations defined by another teleporter. +tooltip.ElectricPump=An advanced pump capable of pumping out an entire !nlava lake. +tooltip.ElectricChest=A portable, 54-slot chest that uses energy to lock !nitself from others by means of password protection. tooltip.Chargepad=A universal chargepad that can charge any energised item !nfrom any mod. +tooltip.LogisticalSorter=A filter-based, advanced sorting machine that !ncan auto-eject specified items out of and into !nadjacent inventories and Logistical Transporters. +tooltip.RotaryCondensentrator=A machine capable of converting gasses into !ntheir fluid form and vice versa. +tooltip.ChemicalInjectionChamber=An elite machine capable of processing !nores into four shards, serving as the initial !nstage of 400% ore processing. +tooltip.ElectrolyticSeparator=A machine that uses the process of !nelectrolysis to split apart a certain !ngas into two different gasses. +tooltip.PrecisionSawmill=A machine used to process logs and other !nwood-based items more efficiently, as well !nas to obtain sawdust. +tooltip.ChemicalDissolutionChamber=An ultimate machine used to !nchemically dissolve all impurities of an !nore, leaving an unprocessed slurry !nbehind. +tooltip.ChemicalWasher=An ultimate machine that cleans unprocessed !nslurry and prepares it for crystallisation. +tooltip.ChemicalCrystallizer=An ultimate machine used to crystallise !npurified ore slurry into ore crystals. +tooltip.SeismicVibrator=A machine that uses seismic vibrations to !nprovide information on differing layers !nof the world. +tooltip.PressurizedReactionChamber=An advanced machine that processes a solid, liquid and gaseous mixture and creates both a gaseous and solid product. +tooltip.PortableTank=A handy, portable tank that lets you carry 14 !nbuckets 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 of the !nsun 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.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. +tooltip.TinOre=A lightweight, yet sturdy, conductive !nmaterial that is found slightly less !ncommonly than Copper. + +//Redstone control +control.disabled=Disabled +control.high=High +control.low=Low +control.disabled.desc=Always active +control.high.desc=Active with signal +control.low.desc=Active without signal + +//Container edit modes +fluidedit.both=Both +fluidedit.fill=Fill +fluidedit.empty=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 + +//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 + +//Creative tab +itemGroup.tabMekanism=Mekanism + +//NEI stuff +nei.chemicalInjectionChamber=C. Injection Chamber +nei.rotaryCondensentrator=R. Condensentrator + +//**********// +//GENERATORS// +//**********// + +//Items +item.BioFuel.name=Bio Fuel +item.SolarPanel.name=Solar Panel + +//Infuse types +infuse.bio=Biomass + +//Generators +tile.Generator.HeatGenerator.name=Heat Generator +tile.Generator.SolarGenerator.name=Solar Generator +tile.Generator.GasGenerator.name=Gas-Burning Generator +tile.Generator.BioGenerator.name=Bio-Generator +tile.Generator.AdvancedSolarGenerator.name=Advanced Solar Generator +tile.Generator.WindTurbine.name=Wind Turbine + +//Gui text +gui.heatGenerator.fuel=Fuel +gui.solarGenerator.sun=Sun +gui.bioGenerator.bioFuel=BioFuel +gui.electrolyticSeparator.dump=Dump + +//*****// +//TOOLS// +//*****// + +//Vanilla Paxels +item.WoodPaxel.name=Wood Paxel +item.StonePaxel.name=Stone Paxel +item.IronPaxel.name=Iron Paxel +item.DiamondPaxel.name=Diamond Paxel +item.GoldPaxel.name=Gold Paxel + +//Obsidian +item.ObsidianHelmet.name=Obsidian Helmet +item.ObsidianChestplate.name=Obsidian Chestplate +item.ObsidianLeggings.name=Obsidian Leggings +item.ObsidianBoots.name=Obsidian Boots +item.ObsidianPaxel.name=Obsidian Paxel +item.ObsidianPickaxe.name=Obsidian Pickaxe +item.ObsidianAxe.name=Obsidian Axe +item.ObsidianShovel.name=Obsidian Shovel +item.ObsidianHoe.name=Obsidian Hoe +item.ObsidianSword.name=Obsidian Sword + +//Lapis Lazuli +item.LazuliHelmet.name=Lapis Lazuli Helmet +item.LazuliChestplate.name=Lapis Lazuli Chestplate +item.LazuliLeggings.name=Lapis Lazuli Leggings +item.LazuliBoots.name=Lapis Lazuli Boots +item.LazuliPaxel.name=Lapis Lazuli Paxel +item.LazuliPickaxe.name=Lapis Lazuli Pickaxe +item.LazuliAxe.name=Lapis Lazuli Axe +item.LazuliShovel.name=Lapis Lazuli Shovel +item.LazuliHoe.name=Lapis Lazuli Hoe +item.LazuliSword.name=Lapis Lazuli Sword + +//Osmium +item.OsmiumHelmet.name=Osmium Helmet +item.OsmiumChestplate.name=Osmium Chestplate +item.OsmiumLeggings.name=Osmium Leggings +item.OsmiumBoots.name=Osmium Boots +item.OsmiumPaxel.name=Osmium Paxel +item.OsmiumPickaxe.name=Osmium Pickaxe +item.OsmiumAxe.name=Osmium Axe +item.OsmiumShovel.name=Osmium Shovel +item.OsmiumHoe.name=Osmium Hoe +item.OsmiumSword.name=Osmium Sword + +//Bronze +item.BronzeHelmet.name=Bronze Helmet +item.BronzeChestplate.name=Bronze Chestplate +item.BronzeLeggings.name=Bronze Leggings +item.BronzeBoots.name=Bronze Boots +item.BronzePaxel.name=Bronze Paxel +item.BronzePickaxe.name=Bronze Pickaxe +item.BronzeAxe.name=Bronze Axe +item.BronzeShovel.name=Bronze Shovel +item.BronzeHoe.name=Bronze Hoe +item.BronzeSword.name=Bronze Sword + +//Glow +item.GlowstoneHelmet.name=Glowstone Helmet +item.GlowstoneChestplate.name=Glowstone Chestplate +item.GlowstoneLeggings.name=Glowstone Leggings +item.GlowstoneBoots.name=Glowstone Boots +item.GlowstonePaxel.name=Glowstone Paxel +item.GlowstonePickaxe.name=Glowstone Pickaxe +item.GlowstoneAxe.name=Glowstone Axe +item.GlowstoneShovel.name=Glowstone Shovel +item.GlowstoneHoe.name=Glowstone Hoe +item.GlowstoneSword.name=Glowstone Sword + +//Steel +item.SteelHelmet.name=Steel Helmet +item.SteelChestplate.name=Steel Chestplate +item.SteelLeggings.name=Steel Leggings +item.SteelBoots.name=Steel Boots +item.SteelPaxel.name=Steel Paxel +item.SteelPickaxe.name=Steel Pickaxe +item.SteelAxe.name=Steel Axe +item.SteelShovel.name=Steel Shovel +item.SteelHoe.name=Steel Hoe +item.SteelSword.name=Steel Sword + +//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 armour sets +mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanismTools tool sets \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/lang/en_ZA.lang b/src/main/resources/assets/mekanism/lang/en_ZA.lang new file mode 100644 index 000000000..9b580066f --- /dev/null +++ b/src/main/resources/assets/mekanism/lang/en_ZA.lang @@ -0,0 +1,730 @@ +//********// +//MEKANISM// +//********// + +//Items +tile.ObsidianTNT.name=Obsidian TNT +item.EnrichedAlloy.name=Enriched Alloy +item.ReinforcedAlloy.name=Reinforced Alloy +item.AtomicAlloy.name=Atomic Alloy +item.EnergyTablet.name=Energy Tablet +item.SpeedUpgrade.name=Speed Upgrade +item.EnergyUpgrade.name=Energy Upgrade +item.Robit.name=Robit +item.AtomicDisassembler.name=Atomic Disassembler +item.ElectricBow.name=Electric Bow +item.EnrichedIron.name=Enriched Iron +item.CompressedCarbon.name=Compressed Carbon +item.CompressedRedstone.name=Compressed Redstone +item.CompressedDiamond.name=Compressed Diamond +item.CompressedObsidian.name=Compressed Obsidian +item.PortableTeleporter.name=Portable Teleporter +item.TeleportationCore.name=Teleportation Core +item.Configurator.name=Configurator +item.NetworkReader.name=Network Reader +item.WalkieTalkie.name=Walkie-Talkie +item.Jetpack.name=Jetpack +item.ScubaTank.name=Scuba Tank +item.GasMask.name=Gas Mask +item.Dictionary.name=Dictionary +item.ElectrolyticCore.name=Electrolytic Core +item.Sawdust.name=Sawdust +item.Salt.name=Salt +item.BrineBucket.name=Brine Bucket +item.FreeRunners.name=Free Runners +item.ArmoredJetpack.name=Armored Jetpack +item.FilterCard.name=Filter Card +item.SeismicReader.name=Seismic Reader +item.HDPEPellet.name=HDPE Pellet +item.HDPERod.name=HDPE Rod +item.HDPESheet.name=HDPE Sheet +item.PlaStick.name=PlaStick +item.Substrate.name=Substrate + +//Control Circuits +item.BasicControlCircuit.name=Basic Control Circuit +item.AdvancedControlCircuit.name=Advanced Control Circuit +item.EliteControlCircuit.name=Elite Control Circuit +item.UltimateControlCircuit.name=Ultimate Control Circuit + +//Gas Tank +tile.GasTank.GasTank.name=Gas Tank + +//Cardboard Box +tile.CardboardBox.name=Cardboard Box + +//Bounding Block +tile.BoundingBlock.name=Bounding Block + +//Salt +tile.SaltBlock.name=Salt Block + +//Basic Block +tile.BasicBlock.OsmiumBlock.name=Osmium Block +tile.BasicBlock.BronzeBlock.name=Bronze Block +tile.BasicBlock.RefinedObsidian.name=Refined Obsidian +tile.BasicBlock.CharcoalBlock.name=Charcoal Block +tile.BasicBlock.RefinedGlowstone.name=Refined Glowstone +tile.BasicBlock.SteelBlock.name=Steel Block +tile.BasicBlock.Bin.name=Bin +tile.BasicBlock.TeleporterFrame.name=Teleporter Frame +tile.BasicBlock.SteelCasing.name=Steel Casing +tile.BasicBlock.DynamicTank.name=Dynamic Tank +tile.BasicBlock.DynamicGlass.name=Dynamic Glass +tile.BasicBlock.DynamicValve.name=Dynamic Valve +tile.BasicBlock.CopperBlock.name=Copper Block +tile.BasicBlock.TinBlock.name=Tin Block +tile.BasicBlock.SalinationController.name=Salination Controller +tile.BasicBlock.SalinationValve.name=Salination Valve + +//Basic Block 2 (second ID iteration) +tile.BasicBlock2.SalinationBlock.name=Salination Block + +//Machine Block +tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber +tile.MachineBlock.OsmiumCompressor.name=Osmium Compressor +tile.MachineBlock.Combiner.name=Combiner +tile.MachineBlock.Crusher.name=Crusher +tile.MachineBlock.BasicFactory.name=Basic Factory +tile.MachineBlock.AdvancedFactory.name=Advanced Factory +tile.MachineBlock.EliteFactory.name=Elite Factory +tile.MachineBlock.MetallurgicInfuser.name=Metallurgic Infuser +tile.MachineBlock.PurificationChamber.name=Purification Chamber +tile.MachineBlock.EnergizedSmelter.name=Energised Smelter +tile.MachineBlock.Teleporter.name=Teleporter +tile.MachineBlock.ElectricPump.name=Electric Pump +tile.MachineBlock.ElectricChest.name=Electric Chest +tile.MachineBlock.Chargepad.name=Chargepad +tile.MachineBlock.LogisticalSorter.name=Logistical Sorter +tile.MachineBlock.DigitalMiner.name=Digital Miner + +//Machine Block 2 (second ID iteration) +tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator +tile.MachineBlock2.ChemicalOxidizer.name=Chemical Oxidiser +tile.MachineBlock2.ChemicalInfuser.name=Chemical Infuser +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 Crystalliser +tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator +tile.MachineBlock2.PressurizedReactionChamber.name=Pressurised Reaction Chamber +tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC +tile.MachineBlock2.PortableTank.name=Portable Tank +tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher + +//Plastic +tile.PlasticBlock.name=Plastic Block +tile.SlickPlasticBlock.name=Slick Plastic Block +tile.GlowPlasticBlock.name=Plastic Glow Block +tile.ReinforcedPlasticBlock.name=Reinforced Plastic Block +tile.RoadPlasticBlock.name=Plastic Road + +tile.PlasticFence.name=Plastic Barrier + +//Infuse types +infuse.carbon=Carbon +infuse.tin=Tin +infuse.diamond=Diamond +infuse.redstone=Redstone +infuse.fungi=Fungi +infuse.obsidian=Obsidian + +//Ore Block +tile.OreBlock.OsmiumOre.name=Osmium Ore +tile.OreBlock.CopperOre.name=Copper Ore +tile.OreBlock.TinOre.name=Tin Ore + +item.MultipartTransmitter.PressurizedTube.name=Pressurised Tube +item.MultipartTransmitter.BasicUniversalCable.name=Basic Universal Cable +item.MultipartTransmitter.AdvancedUniversalCable.name=Advanced Universal Cable +item.MultipartTransmitter.EliteUniversalCable.name=Elite Universal Cable +item.MultipartTransmitter.UltimateUniversalCable.name=Ultimate Universal Cable +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 + +//Glow Panel +item.GlowPanel.name=Glow Panel + +//Energy Cubes +tile.EnergyCube.Basic.name=Basic Energy Cube +tile.EnergyCube.Advanced.name=Advanced Energy Cube +tile.EnergyCube.Elite.name=Elite Energy Cube +tile.EnergyCube.Ultimate.name=Ultimate Energy Cube + +//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 + +//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 + +//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 + +//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 + +//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 + +//Ingots +item.obsidianIngot.name=Obsidian Ingot +item.osmiumIngot.name=Osmium Ingot +item.bronzeIngot.name=Bronze Ingot +item.glowstoneIngot.name=Glowstone Ingot +item.steelIngot.name=Steel Ingot +item.copperIngot.name=Copper Ingot +item.tinIngot.name=Tin Ingot + +//Gasses +gas.hydrogen=Hydrogen +gas.oxygen=Oxygen +gas.water=Water Vapour +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.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.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 + +//BC Fuel Gases +gas.fuel=Vaporised Fuel +gas.oil=Vaporised 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 + +//OreGas names +oregas.iron=Iron Ore +oregas.gold=Gold Ore +oregas.osmium=Osmium Ore +oregas.copper=Copper Ore +oregas.tin=Tin Ore +oregas.silver=Silver Ore +oregas.obsidian=Obsidian Ore +oregas.lead=Lead Ore + +//Update handler text +update.consider=Consider updating to version +update.newFeatures=New features +update.visit=Visit +update.toDownload=to download +update.devBuild=Using developer build +update.outdated=Using outdated version on one or more modules + +//Key description text +key.mode=Mode Switch +key.voice=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 + +//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.modID=Mod ID +gui.key=Key +gui.id=ID +gui.finished=Finished + +gui.chemicalInfuser.short=C. Infuser +gui.chemicalDissolutionChamber.short=C. Dissolution Chamber + +gui.dictionary.noKey=No key. + +gui.configuration=Configuration +gui.configuration.strictInput=Strict Input + +gui.rotaryCondensentrator.toggleOperation=Toggle operation + +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.seismicReader.short=S. Reader +gui.seismicReader.solids=Solids +gui.seismicReader.fluids=Fluids +gui.seismicReader.reading=Reading + +gui.filterSelect.title=Create New Filter + +gui.oredictFilter=OreDict Filter +gui.oredictFilter.noKey=No key entered +gui.oredictFilter.sameKey=Same key + +gui.modIDFilter=Mod ID Filter +gui.modIDFilter.noID=No ID entered +gui.modIDFilter.sameID=Same ID + +gui.itemFilter=Item Filter +gui.itemFilter.noItem=No item +gui.itemFilter.details=ItemStack Details +gui.itemFilter.min=Min +gui.itemFilter.max=Max + +gui.materialFilter=Material Filter +gui.materialFilter.details=Using material of + +gui.portableTeleporter=Portable Teleporter + +gui.teleporter.notReady=Not Ready +gui.teleporter.ready=Ready +gui.teleporter.needsEnergy=Needs energy +gui.teleporter.linksCapacity=Links > 2 +gui.teleporter.noLink=No link found + +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.dropPickup=Drop pickup +gui.robit.owner=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.logisticalSorter.default=Default +gui.logisticalSorter.auto=Auto +gui.logisticalSorter.roundRobin=Round-robin + +gui.electricChest.editPassword=Edit Password + +gui.digitalMinerConfig=Digital Miner Config + +gui.digitalMiner.autoPull=Auto-pull +gui.digitalMiner.replaceBlock=Replace block +gui.digitalMiner.reset=Reset +gui.digitalMiner.silkTouch=Silk touch +gui.digitalMiner.pull=Pull +gui.digitalMiner.silk=Silk +gui.digitalMiner.toMine=To mine +gui.digitalMiner.running=Running +gui.digitalMiner.inverse=Inverse mode + +//Recipe names +recipe.mekanismShaped=Shaped + +//Item and block tooltip text +tooltip.configurator.modify=Modify +tooltip.configurator.empty=Empty +tooltip.configurator.wrench=Wrench +tooltip.configurator.link=Link +tooltip.configurator.pumpReset=Reset Electric Pump calculation +tooltip.configurator.toggleDiverter=Diverter mode changed to +tooltip.configurator.toggleColor=Colour bumped to +tooltip.configurator.viewColor=Current colour +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.upgrade.speed=Speed +tooltip.upgrade.energy=Energy + +tooltip.inventory=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.items=Items +tooltip.blocks=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.hp=HP +tooltip.configureState=Configure State + +tooltip.portableTank.bucketMode=Bucket Mode + +tooltip.disassembler.normal=normal +tooltip.disassembler.slow=slow +tooltip.disassembler.fast=fast +tooltip.disassembler.vein=vein +tooltip.disassembler.off=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.balloon=Balloon + +tooltip.jetpack.regular=Regular +tooltip.jetpack.hover=Hover +tooltip.jetpack.disabled=Disabled + +tooltip.seismicReader.needsEnergy=Not enough energy 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. +tooltip.OsmiumCompressor=A fairly advanced machine used to compress !nosmium into various dusts in order to create !ntheir ingot counterparts. +tooltip.Combiner=A machine used to combine dusts and cobblestone to !nform their ore counterparts. +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 that can !nmine whatever block you tell it to within !na 32 block (max) radius. +tooltip.BasicFactory=The lowest tier of the line of Factories, which can !nbe used to process multiple machine operations !nat once. +tooltip.AdvancedFactory=The middle tier of the line of Factories, which can !nbe used to process multiple machine !noperations at once. +tooltip.EliteFactory=The highest tier of the line of Factories, which can !nbe used to process multiple machine !noperations at once. +tooltip.MetallurgicInfuser=A machine used to infuse various materials !ninto (generally) metals to create metal alloys !nand other compounds. +tooltip.PurificationChamber=An advanced machine capable of processing !nores into three clumps, serving as the initial !nstage of 300% ore processing. +tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based !nfurnace that runs off of energy. +tooltip.Teleporter=A machine capable of teleporting players to various !nlocations defined by another teleporter. +tooltip.ElectricPump=An advanced pump capable of pumping out an entire !nlava lake. +tooltip.ElectricChest=A portable, 54-slot chest that uses energy to lock !nitself from others by means of password protection. +tooltip.Chargepad=A universal chargepad that can charge any energised item !nfrom any mod. +tooltip.LogisticalSorter=A filter-based, advanced sorting machine that !ncan auto-eject specified items out of and into !nadjacent inventories and Logistical Transporters. +tooltip.RotaryCondensentrator=A machine capable of converting gasses into !ntheir fluid form and vice versa. +tooltip.ChemicalInjectionChamber=An elite machine capable of processing !nores into four shards, serving as the initial !nstage of 400% ore processing. +tooltip.ElectrolyticSeparator=A machine that uses the process of !nelectrolysis to split apart a certain !ngas into two different gasses. +tooltip.PrecisionSawmill=A machine used to process logs and other !nwood-based items more efficiently, as well !nas to obtain sawdust. +tooltip.ChemicalDissolutionChamber=An ultimate machine used to !nchemically dissolve all impurities of an !nore, leaving an unprocessed slurry !nbehind. +tooltip.ChemicalWasher=An ultimate machine that cleans unprocessed !nslurry and prepares it for crystallisation. +tooltip.ChemicalCrystallizer=An ultimate machine used to crystallise !npurified ore slurry into ore crystals. +tooltip.SeismicVibrator=A machine that uses seismic vibrations to !nprovide information on differing layers !nof the world. +tooltip.PressurizedReactionChamber=An advanced machine that processes a solid, liquid and gaseous mixture and creates both a gaseous and solid product. +tooltip.PortableTank=A handy, portable tank that lets you carry 14 !nbuckets 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 of the !nsun 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.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. +tooltip.TinOre=A lightweight, yet sturdy, conductive !nmaterial that is found slightly less !ncommonly than Copper. + +//Redstone control +control.disabled=Disabled +control.high=High +control.low=Low +control.disabled.desc=Always active +control.high.desc=Active with signal +control.low.desc=Active without signal + +//Container edit modes +fluidedit.both=Both +fluidedit.fill=Fill +fluidedit.empty=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 + +//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 + +//Creative tab +itemGroup.tabMekanism=Mekanism + +//NEI stuff +nei.chemicalInjectionChamber=C. Injection Chamber +nei.rotaryCondensentrator=R. Condensentrator + +//**********// +//GENERATORS// +//**********// + +//Items +item.BioFuel.name=Bio Fuel +item.SolarPanel.name=Solar Panel + +//Infuse types +infuse.bio=Biomass + +//Generators +tile.Generator.HeatGenerator.name=Heat Generator +tile.Generator.SolarGenerator.name=Solar Generator +tile.Generator.GasGenerator.name=Gas-Burning Generator +tile.Generator.BioGenerator.name=Bio-Generator +tile.Generator.AdvancedSolarGenerator.name=Advanced Solar Generator +tile.Generator.WindTurbine.name=Wind Turbine + +//Gui text +gui.heatGenerator.fuel=Fuel +gui.solarGenerator.sun=Sun +gui.bioGenerator.bioFuel=BioFuel +gui.electrolyticSeparator.dump=Dump + +//*****// +//TOOLS// +//*****// + +//Vanilla Paxels +item.WoodPaxel.name=Wood Paxel +item.StonePaxel.name=Stone Paxel +item.IronPaxel.name=Iron Paxel +item.DiamondPaxel.name=Diamond Paxel +item.GoldPaxel.name=Gold Paxel + +//Obsidian +item.ObsidianHelmet.name=Obsidian Helmet +item.ObsidianChestplate.name=Obsidian Chestplate +item.ObsidianLeggings.name=Obsidian Leggings +item.ObsidianBoots.name=Obsidian Boots +item.ObsidianPaxel.name=Obsidian Paxel +item.ObsidianPickaxe.name=Obsidian Pickaxe +item.ObsidianAxe.name=Obsidian Axe +item.ObsidianShovel.name=Obsidian Shovel +item.ObsidianHoe.name=Obsidian Hoe +item.ObsidianSword.name=Obsidian Sword + +//Lapis Lazuli +item.LazuliHelmet.name=Lapis Lazuli Helmet +item.LazuliChestplate.name=Lapis Lazuli Chestplate +item.LazuliLeggings.name=Lapis Lazuli Leggings +item.LazuliBoots.name=Lapis Lazuli Boots +item.LazuliPaxel.name=Lapis Lazuli Paxel +item.LazuliPickaxe.name=Lapis Lazuli Pickaxe +item.LazuliAxe.name=Lapis Lazuli Axe +item.LazuliShovel.name=Lapis Lazuli Shovel +item.LazuliHoe.name=Lapis Lazuli Hoe +item.LazuliSword.name=Lapis Lazuli Sword + +//Osmium +item.OsmiumHelmet.name=Osmium Helmet +item.OsmiumChestplate.name=Osmium Chestplate +item.OsmiumLeggings.name=Osmium Leggings +item.OsmiumBoots.name=Osmium Boots +item.OsmiumPaxel.name=Osmium Paxel +item.OsmiumPickaxe.name=Osmium Pickaxe +item.OsmiumAxe.name=Osmium Axe +item.OsmiumShovel.name=Osmium Shovel +item.OsmiumHoe.name=Osmium Hoe +item.OsmiumSword.name=Osmium Sword + +//Bronze +item.BronzeHelmet.name=Bronze Helmet +item.BronzeChestplate.name=Bronze Chestplate +item.BronzeLeggings.name=Bronze Leggings +item.BronzeBoots.name=Bronze Boots +item.BronzePaxel.name=Bronze Paxel +item.BronzePickaxe.name=Bronze Pickaxe +item.BronzeAxe.name=Bronze Axe +item.BronzeShovel.name=Bronze Shovel +item.BronzeHoe.name=Bronze Hoe +item.BronzeSword.name=Bronze Sword + +//Glow +item.GlowstoneHelmet.name=Glowstone Helmet +item.GlowstoneChestplate.name=Glowstone Chestplate +item.GlowstoneLeggings.name=Glowstone Leggings +item.GlowstoneBoots.name=Glowstone Boots +item.GlowstonePaxel.name=Glowstone Paxel +item.GlowstonePickaxe.name=Glowstone Pickaxe +item.GlowstoneAxe.name=Glowstone Axe +item.GlowstoneShovel.name=Glowstone Shovel +item.GlowstoneHoe.name=Glowstone Hoe +item.GlowstoneSword.name=Glowstone Sword + +//Steel +item.SteelHelmet.name=Steel Helmet +item.SteelChestplate.name=Steel Chestplate +item.SteelLeggings.name=Steel Leggings +item.SteelBoots.name=Steel Boots +item.SteelPaxel.name=Steel Paxel +item.SteelPickaxe.name=Steel Pickaxe +item.SteelAxe.name=Steel Axe +item.SteelShovel.name=Steel Shovel +item.SteelHoe.name=Steel Hoe +item.SteelSword.name=Steel Sword + +//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 armour sets +mekanism.configgui.ctgy.tools.tools.tooltip=Settings regarding the efficiency values and balance of MekanismTools tool sets \ No newline at end of file From afe69a0f9f0446b616c315960d463ec2bd9cc2f3 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 13 Jul 2014 18:41:16 +0400 Subject: [PATCH 2/4] Update ru_RU.lang --- .../resources/assets/mekanism/lang/ru_RU.lang | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/resources/assets/mekanism/lang/ru_RU.lang b/src/main/resources/assets/mekanism/lang/ru_RU.lang index ea0a84733..9aa7fbd04 100644 --- a/src/main/resources/assets/mekanism/lang/ru_RU.lang +++ b/src/main/resources/assets/mekanism/lang/ru_RU.lang @@ -5,6 +5,8 @@ //Items tile.ObsidianTNT.name=Обсидиановый динамит item.EnrichedAlloy.name=Обогащённый сплав +item.ReinforcedAlloy.name=Укреплённый сплав +item.AtomicAlloy.name=Атомный сплав item.EnergyTablet.name=Энергетический планшет item.SpeedUpgrade.name=Улучшение «Скорость» item.EnergyUpgrade.name=Улучшение «Энергия» @@ -39,6 +41,12 @@ item.HDPESheet.name=Лист полиэтилена НД item.PlaStick.name=Пластиковая палка item.Substrate.name=Субстрат +//Control Circuits +item.BasicControlCircuit.name=Основная схема управления +item.AdvancedControlCircuit.name=Продвинутая схема управления +item.EliteControlCircuit.name=Элитная схема управления +item.UltimateControlCircuit.name=Максимальная схема управления + //Gas Tank tile.GasTank.GasTank.name=Газовый баллон @@ -48,6 +56,9 @@ tile.CardboardBox.name=Картонная коробка //Bounding Block tile.BoundingBlock.name=Скреплённый блок +//Salt +tile.SaltBlock.name=Блок соли + //Basic Block tile.BasicBlock.OsmiumBlock.name=Осмиевый блок tile.BasicBlock.BronzeBlock.name=Бронзовый блок @@ -119,6 +130,7 @@ infuse.tin=Олово infuse.diamond=Алмаз infuse.redstone=Красный камень infuse.fungi=Грибок +infuse.obsidian=Обсидиан //Ore Block tile.OreBlock.OsmiumOre.name=Осмиевая руда @@ -221,6 +233,8 @@ gas.hydrogenChloride=Хлороводород gas.liquidOsmium=Жидкий осмий gas.liquidStone=Жидкий камень gas.ethene=Этилен +gas.sodium=Натрий +gas.brine=Газообразный рассол gas.iron=Расплавленное железо gas.gold=Расплавленное золото @@ -699,3 +713,8 @@ item.SteelAxe.name=Стальной топор item.SteelShovel.name=Стальная лопата item.SteelHoe.name=Стальная мотыга item.SteelSword.name=Стальной меч + +//Config Gui +mekanism.configgui.ctgy.tools.general.tooltip=Настройки, касающиеся основной настройки MekanismTools +mekanism.configgui.ctgy.tools.armor.tooltip=Настройки, касающиеся значений защиты и баланса наборов брони MekanismTools +mekanism.configgui.ctgy.tools.tools.tooltip=Настройки, касающиеся значений эффективности и баланса наборов инструментов MekanismTools From 3e3bf2c25c459a67968520a175be21c7a6525a77 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 13 Jul 2014 19:53:05 +0100 Subject: [PATCH 3/4] Fix Iron Dust smelting issue. Close #1478 --- src/main/java/mekanism/common/integration/OreDictManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index cd6880eb1..4e45cd55b 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -365,11 +365,11 @@ public final class OreDictManager } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Mekanism.Dust, 8), MekanismUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Mekanism.Dust, 1, 8), MekanismUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Mekanism.Dust, 9), MekanismUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(Mekanism.Dust, 1, 9), MekanismUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); } catch(Exception e) {} try { From c560bdc2e101585b3b20e15f077d5ee730a43bae Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 13 Jul 2014 19:53:24 +0100 Subject: [PATCH 4/4] Fix a different, unrelated OreDict issue. --- src/main/java/mekanism/api/BlockInfo.java | 38 +++++++++++++++++++ src/main/java/mekanism/api/ItemInfo.java | 18 ++++----- src/main/java/mekanism/api/MekanismAPI.java | 10 ++--- .../java/mekanism/common/OreDictCache.java | 3 +- .../common/miner/ThreadMinerSearch.java | 8 ++-- .../common/network/PacketBoxBlacklist.java | 6 +-- 6 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 src/main/java/mekanism/api/BlockInfo.java diff --git a/src/main/java/mekanism/api/BlockInfo.java b/src/main/java/mekanism/api/BlockInfo.java new file mode 100644 index 000000000..50c990f27 --- /dev/null +++ b/src/main/java/mekanism/api/BlockInfo.java @@ -0,0 +1,38 @@ +package mekanism.api; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +public class BlockInfo +{ + public Block block; + public int meta; + + public BlockInfo(Block b, int j) + { + block = b; + meta = j; + } + + public static BlockInfo get(ItemStack stack) + { + return new BlockInfo(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); + } + + @Override + public boolean equals(Object obj) + { + return obj instanceof BlockInfo && + ((BlockInfo)obj).block == block && + ((BlockInfo)obj).meta == meta; + } + + @Override + public int hashCode() + { + int code = 1; + code = 31 * code + block.getUnlocalizedName().hashCode(); + code = 31 * code + meta; + return code; + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/api/ItemInfo.java b/src/main/java/mekanism/api/ItemInfo.java index 4fee46e69..2c45f0cfe 100644 --- a/src/main/java/mekanism/api/ItemInfo.java +++ b/src/main/java/mekanism/api/ItemInfo.java @@ -1,29 +1,29 @@ package mekanism.api; -import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemInfo { - public Block block; + public Item item; public int meta; - public ItemInfo(Block b, int j) + public ItemInfo(Item i, int j) { - block = b; + item = i; meta = j; } public static ItemInfo get(ItemStack stack) { - return new ItemInfo(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); + return new ItemInfo(stack.getItem(), stack.getItemDamage()); } @Override public boolean equals(Object obj) { - return obj instanceof ItemInfo && - ((ItemInfo)obj).block == block && + return obj instanceof BlockInfo && + ((ItemInfo)obj).item == item && ((ItemInfo)obj).meta == meta; } @@ -31,8 +31,8 @@ public class ItemInfo public int hashCode() { int code = 1; - code = 31 * code + block.getUnlocalizedName().hashCode(); + code = 31 * code + item.getUnlocalizedName().hashCode(); code = 31 * code + meta; return code; } -} \ No newline at end of file +} diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 37a5cb9af..4f4cef4a9 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -11,11 +11,11 @@ import net.minecraftforge.oredict.OreDictionary; public class MekanismAPI { //Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes - private static Set cardboardBoxIgnore = new HashSet(); + private static Set cardboardBoxIgnore = new HashSet(); public static boolean isBlockCompatible(Item item, int meta) { - for(ItemInfo i : cardboardBoxIgnore) + for(BlockInfo i : cardboardBoxIgnore) { if(i.block == Block.getBlockFromItem(item) && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) { @@ -28,15 +28,15 @@ public class MekanismAPI public static void addBoxBlacklist(Block block, int meta) { - cardboardBoxIgnore.add(new ItemInfo(block, meta)); + cardboardBoxIgnore.add(new BlockInfo(block, meta)); } public static void removeBoxBlacklist(Block block, int meta) { - cardboardBoxIgnore.remove(new ItemInfo(block, meta)); + cardboardBoxIgnore.remove(new BlockInfo(block, meta)); } - public static Set getBoxIgnore() + public static Set getBoxIgnore() { return cardboardBoxIgnore; } diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index aacd9793e..572b45c0e 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -3,11 +3,10 @@ package mekanism.common; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import mekanism.api.ItemInfo; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.StackUtils; + import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/miner/ThreadMinerSearch.java index 969cb9b79..1560e4695 100644 --- a/src/main/java/mekanism/common/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/miner/ThreadMinerSearch.java @@ -4,12 +4,12 @@ import java.util.BitSet; import java.util.HashMap; import java.util.Map; +import mekanism.api.BlockInfo; import mekanism.api.Coord4D; -import mekanism.api.ItemInfo; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; -import net.minecraft.init.Blocks; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,7 +21,7 @@ public class ThreadMinerSearch extends Thread public BitSet oresToMine = new BitSet(); - public Map acceptedItems = new HashMap(); + public Map acceptedItems = new HashMap(); public int found = 0; @@ -44,7 +44,7 @@ public class ThreadMinerSearch extends Thread Coord4D coord = tileEntity.getStartingCoord(); int diameter = tileEntity.getDiameter(); int size = tileEntity.getTotalSize(); - ItemInfo info = new ItemInfo(null, 0); + BlockInfo info = new BlockInfo(null, 0); for(int i = 0; i < size; i++) { diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index fee67dc73..2855a18a0 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -1,12 +1,12 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import mekanism.api.ItemInfo; + +import mekanism.api.BlockInfo; import mekanism.api.MekanismAPI; import mekanism.common.Mekanism; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; import net.minecraft.block.Block; -import net.minecraft.world.World; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -28,7 +28,7 @@ public class PacketBoxBlacklist implements IMessageHandler