diff --git a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass.java b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass.java index 986a847..5d928cd 100644 --- a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass.java +++ b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass.java @@ -31,11 +31,11 @@ public class GT_MetaPipeEntity_Brass extends GT_MetaPipeEntity_Item { @Override public int getPipeCapacity() { - return 2; + return 1; } @Override public int getStepSize() { return 32768; } -} \ No newline at end of file +} diff --git a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass_Large.java b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass_Large.java index 8fdc4f7..08b0596 100644 --- a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass_Large.java +++ b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Brass_Large.java @@ -31,11 +31,11 @@ public class GT_MetaPipeEntity_Brass_Large extends GT_MetaPipeEntity_Item { @Override public int getPipeCapacity() { - return 4; + return 2; } @Override public int getStepSize() { return 16384; } -} \ No newline at end of file +} diff --git a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum.java b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum.java index 631927a..beb278a 100644 --- a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum.java +++ b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum.java @@ -31,11 +31,11 @@ public class GT_MetaPipeEntity_Electrum extends GT_MetaPipeEntity_Item { @Override public int getPipeCapacity() { - return 4; + return 2; } @Override public int getStepSize() { return 16384; } -} \ No newline at end of file +} diff --git a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum_Large.java b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum_Large.java index fcac88b..af754b9 100644 --- a/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum_Large.java +++ b/src/main/java/gregtechmod/common/tileentities/pipes/items/GT_MetaPipeEntity_Electrum_Large.java @@ -31,11 +31,11 @@ public class GT_MetaPipeEntity_Electrum_Large extends GT_MetaPipeEntity_Item { @Override public int getPipeCapacity() { - return 8; + return 4; } @Override public int getStepSize() { return 8192; } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/gregtech_addon/lang/en_US.lang b/src/main/resources/assets/gregtech_addon/lang/en_US.lang index ae98508..7e645de 100644 --- a/src/main/resources/assets/gregtech_addon/lang/en_US.lang +++ b/src/main/resources/assets/gregtech_addon/lang/en_US.lang @@ -8,7 +8,7 @@ tile.BlockMetaID_Block.LESU_Block.name=LESU-Block tile.BlockMetaID_Block.Block_of_Aluminium.name=Block of Aluminium tile.BlockMetaID_Block.Block_of_Titanium.name=Block of Titanium tile.BlockMetaID_Block.Block_of_Chrome.name=Block of Chrome -tile.BlockMetaID_Block.Highly_Advanced_Machineblock.name=Highly Advanced Machineblock +tile.BlockMetaID_Block.Highly_Advanced_Machineblock.name=Highly Advanced Machine Block tile.BlockMetaID_Block.Block_of_Steel.name=Block of Steel tile.BlockMetaID_Block.Block_of_Brass.name=Block of Brass tile.BlockMetaID_Block.Standard_Machine_Casing.name=Standard Machine Casing @@ -61,7 +61,7 @@ tile.BlockMetaID_Stone1.GT_Red_Granite_Bricks_Cracked.name=Cracked Red Granite B tile.BlockMetaID_Stone1.GT_Red_Granite_Bricks_Mossy.name=Mossy Red Granite Bricks tile.BlockMetaID_Stone1.GT_Red_Granite_Bricks_Chiseled.name=Chiseled Red Granite tile.BlockMetaID_Stone1.GT_Red_Granite_Smooth.name=Smooth Red Granite -tile.BlockMetaID_Machine.GT_BUG.name=You ran into a serious Bug, if you have legitly aquired this Block, please report it immidietly +tile.BlockMetaID_Machine.GT_BUG.name=You ran into a serious Bug, if you have legitimately acquired this Block, please report it immediately tile.BlockMetaID_Machine.Fusionreactor.name=Fusion Reactor tile.BlockMetaID_Machine.Lightningrod.name=Lightning Rod tile.BlockMetaID_Machine.Lightningrod.tooltip=Generates Power from lightning strikes @@ -85,12 +85,12 @@ tile.BlockMetaID_Machine.Playerdetector.message.3=Detects all Players except %s tile.BlockMetaID_Machine.Matterfabricator.name=Matter Fabricator tile.BlockMetaID_Machine.Supercondensator.name=Supercondensator -metatileentity.GT_E_Craftingtable.name=Electric Craftingtable +metatileentity.GT_E_Craftingtable.name=Electric Crafting Table metatileentity.GT_E_Craftingtable.tooltip=Automatic Crafting Table Mk III metatileentity.GT_Translocator.name=Electric Translocator metatileentity.GT_Translocator.tooltip=Moves Items from A to B metatileentity.GT_E_Buffer_Small.name=Small Electric Buffer -metatileentity.GT_E_Buffer_Small.tooltip=A small directable Hopper with an inbuilt Energy Conduit! +metatileentity.GT_E_Buffer_Small.tooltip=A small directable Hopper with an in-built Energy Conduit! metatileentity.GT_E_Buffer_Large.name=Large Electric Buffer metatileentity.GT_E_Buffer_Large.tooltip=A chest-sized Buffer! metatileentity.GT_Adv_Translocator.name=Advanced Translocator @@ -117,7 +117,7 @@ metatileentity.GT_BlastFurnace.UI.heat_capacity=Heat Capacity: %s K metatileentity.GT_QuantumTank.name=Quantum Tank metatileentity.GT_QuantumTank.tooltip=With a capacity of 488.28125 Chunks! metatileentity.GT_ImplosionCompressor.name=Implosion Compressor -metatileentity.GT_ImplosionCompressor.tooltip=Over 9000 Gibbl! +metatileentity.GT_ImplosionCompressor.tooltip=Over 9,000 Gibbl! metatileentity.GT_Sawmill.name=Industrial Sawmill metatileentity.GT_Sawmill.tooltip=Get mo Planks for ya Logs metatileentity.GT_DieselGenerator.name=Diesel Generator @@ -195,19 +195,19 @@ metatileentity.GT_RedstoneLamp.tooltip=Redstone Controlled Lamp metatileentity.GT_RedstoneNoteBlock.name=Redstone Note Block metatileentity.GT_RedstoneNoteBlock.tooltip=Rotate to switch Notes metatileentity.GT_RedstoneButtonPanel.name=Button Panel -metatileentity.GT_RedstoneButtonPanel.tooltip=Rightclick with Screwdriver to change Button Design +metatileentity.GT_RedstoneButtonPanel.tooltip=Right-click with Screwdriver to change Button Design metatileentity.GT_RedstoneDisplayBlock.name=Redstone Display metatileentity.GT_RedstoneDisplayBlock.tooltip=Displays Redstone Strength metatileentity.GT_RedstoneCircuitBlock.name=Redstone Circuit Block metatileentity.GT_RedstoneCircuitBlock.tooltip=Computes Redstone metatileentity.GT_Shelf.name=Wood encased Shelf metatileentity.GT_Shelf.tooltip=Decorative Item Storage -metatileentity.GT_Shelf_Iron.name=Metal encased Shelf +metatileentity.GT_Shelf_Iron.name=Metal Encased Shelf metatileentity.GT_Shelf_FileCabinet.name=File Cabinet -metatileentity.GT_Shelf_Desk.name=Metal encased Desk +metatileentity.GT_Shelf_Desk.name=Metal Encased Desk metatileentity.GT_Shelf_Compartment.name=Compartment metatileentity.GT_DigitalTank.name=Digital Tank -metatileentity.GT_DigitalTank.tooltip=With a capacity of 256000 Liters! +metatileentity.GT_DigitalTank.tooltip=With a capacity of 256,000 Liters! metatileentity.GT_TradeOMat.name=Trade-O-Mat metatileentity.GT_TradeOMat.tooltip=Electric Trading Machine metatileentity.GT_PlayerDetector.name=Player Detector @@ -278,9 +278,9 @@ metatileentity.GT_Multi_AutoCrafter.tooltip=Highly Advanced Autocrafter metatileentity.GT_Multi_GasTurbine.name=Large Gas Turbine metatileentity.GT_Multi_GasTurbine.tooltip=About 42 small Gas Turbines worth metatileentity.GT_Multi_SteamTurbine.name=Large Steam Turbine -metatileentity.GT_Multi_SteamTurbine.tooltip=Consumes 1600 Liters of Steam per Tick +metatileentity.GT_Multi_SteamTurbine.tooltip=Consumes 1,600 Liters of Steam per Tick metatileentity.GT_Multi_PlasmaTurbine.name=Large Plasma Turbine -metatileentity.GT_Multi_PlasmaTurbine.tooltip=Gives you and 8192 EU per tick! +metatileentity.GT_Multi_PlasmaTurbine.tooltip=Gives you and 8,192 EU per tick! metatileentity.GT_Multi_ThermalBoiler.name=Thermal Boiler metatileentity.GT_Multi_ThermalBoiler.tooltip=Converts Heat into Steam metatileentity.GT_Lathe.name=Lathe @@ -296,7 +296,7 @@ metatileentity.GT_Extruder.tooltip=Universal Machine for Metal Working metatileentity.GT_RetrieverAdvanced.name=Advanced retriever metatileentity.GT_RetrieverAdvanced.tooltip=Retrieves and Regulates Items through a GT Pipe System! metatileentity.GT_E_T_Filter.name=Electric Type Filter -metatileentity.GT_E_T_Filter.tooltip=A Buffer, which uses OrePrefixes to filte +metatileentity.GT_E_T_Filter.tooltip=A Buffer, which uses Ore Prefixes to filter metatileentity.GT_E_Filter.name=Electric Filter metatileentity.GT_E_Filter.tooltip=A Filter, which also buffers Items! metatileentity.GT_BronzeTable.name=Bronze Workbench @@ -312,9 +312,9 @@ metatileentity.GT_BronzeAlloySmelter.tooltip=Steam powered combination Smelter metatileentity.GT_BronzeSteamHammer.name=Steam Powered Forge Hammer metatileentity.GT_BronzeSteamHammer.tooltip=Hammers Ingots into Plates metatileentity.GT_BronzeCompressor.name=Steam Compressor -metatileentity.GT_BronzeCompressor.tooltip=Steam powered Compressor +metatileentity.GT_BronzeCompressor.tooltip=Steam Powered Compressor metatileentity.GT_BronzeExtractor.name=Squeezing Extractor -metatileentity.GT_BronzeExtractor.tooltip=Steam powered Extractor +metatileentity.GT_BronzeExtractor.tooltip=Steam Powered Extractor metatileentity.GT_BronzeBlastFurnace.name=Bronze Blast Furnace metatileentity.GT_BronzeBlastFurnace.tooltip=To get your first Steel metatileentity.GT_SteelBoiler.name=High Pressure Coal Boiler @@ -325,23 +325,24 @@ metatileentity.GT_Pipe_Bronze.name=Bronze Fluid Pipe metatileentity.GT_Pipe_Steel.name=Steel Fluid Pipe metatileentity.GT_Pipe_StainlessSteel.name=Stainless Steel Fluid Pipe metatileentity.GT_Pipe_TungstenSteel.name=Tungstensteel Fluid Pipe -metatileentity.GT_Pipe_Bronze_Small.name=Small Bronze pipe -metatileentity.GT_Pipe_Steel_Small.name=Small Steel pipe -metatileentity.GT_Pipe_StainlessSteel_Small.name=Small Stainless steel pipe -metatileentity.GT_Pipe_TungstenSteel_Small.name=Small Tungstensteel pipe +metatileentity.GT_Pipe_Bronze_Small.name=Small Bronze Pipe +metatileentity.GT_Pipe_Steel_Small.name=Small Steel Pipe +metatileentity.GT_Pipe_StainlessSteel_Small.name=Small Stainless Steel Pipe +metatileentity.GT_Pipe_TungstenSteel_Small.name=Small Tungstensteel Pipe metatileentity.GT_Pipe_Bronze_Large.name=Large Bronze Fluid Pipe metatileentity.GT_Pipe_Steel_Large.name=Large Steel Fluid Pipe metatileentity.GT_Pipe_StainlessSteel_Large.name=Large Stainless Steel Fluid Pipe metatileentity.GT_Pipe_TungstenSteel_Large.name=Large Tungstensteel Fluid Pipe metatileentity.GT_Pipe_Brass.name=Brass Item Pipe metatileentity.GT_Pipe_Electrum.name=Electrum Item Pipe +metatileentity.GT_Pipe_Platinum.name=Platinum Item Pipe metatileentity.GT_Pipe_Brass_Large.name=Large Brass Item Pipe metatileentity.GT_Pipe_Electrum_Large.name=Large Electrum Item Pipe metatileentity.GT_Pipe_Platinum_Large.name=Large Platinum Item Pipe metatileentity.GT_Frame_Iron.name=Iron Frame metatileentity.GT_Frame_Aluminium.name=Aluminium Frame metatileentity.GT_Frame_Steel.name=Steel Frame -metatileentity.GT_Frame_StainlessSteel.name=Stainless steel Frame +metatileentity.GT_Frame_StainlessSteel.name=Stainless Steel Frame metatileentity.GT_Frame_TungstenSteel.name=Tungstensteel Frame metatileentity.GT_Frame.tooltip=Just something you can put a Cover or CFoam on. @@ -489,11 +490,11 @@ metatileentity.steam_alloy_smelter.gui=Steam Smelter item.180k_Helium_Coolantcell.name=180k Helium Coolant Cell -item.180k_NaK_Coolantcell.name=180k NaK Coolantcell +item.180k_NaK_Coolantcell.name=180k NaK Coolant Cell item.360k_Helium_Coolantcell.name=360k Helium Coolant Cell -item.360k_NaK_Coolantcell.name=360k NaK Coolantcell +item.360k_NaK_Coolantcell.name=360k NaK Coolant Cell item.60k_Helium_Coolantcell.name=60k Helium Coolant Cell -item.60k_NaK_Coolantcell.name=60k NaK Coolantcell +item.60k_NaK_Coolantcell.name=60k NaK Coolant Cell item.coolant.stored.tooltip=Stored Heat: %s item.RadioactiveCell_Item.tooltip_1=Time left: %d secs item.Bronze_Jack_Hammer.name=Bronze Jack Hammer @@ -560,11 +561,11 @@ item.GT_Components.24.tooltip=Part of advanced Circuitry item.GT_Components.25.name=Pneumatic Generator Upgrade item.GT_Components.25.tooltip=Lets Machines accept RF at 8RF -> 1EU (yes, that is lossy) item.GT_Components.26.name=Lithium Battery Upgrade -item.GT_Components.26.tooltip=Adds 100000 EU to the Energy Capacity +item.GT_Components.26.tooltip=Adds 100,000 EU to the Energy Capacity item.GT_Components.27.name=HV-Transformer Upgrade item.GT_Components.27.tooltip=Higher Tier of Transformer Upgrade item.GT_Components.28.name=RS-Energy-Cell Upgrade -item.GT_Components.28.tooltip=Adds 100000 RF to the Energy Capacity +item.GT_Components.28.tooltip=Adds 100,000 RF to the Energy Capacity item.GT_Components.29.name=Quantum-Chest Upgrade item.GT_Components.29.tooltip=Upgrades a Digital Chest to a Quantum Chest item.GT_Components.3.name=Data Storage Circuit @@ -849,7 +850,7 @@ item.GT_Hammer.tooltip_mfr=Works as Minefactory Hammer too item.GT_Hammer.tip_1=There is Lava behind this Rock. item.GT_Hammer.tip_2=There is a Liquid behind this Rock. item.GT_Hammer.tip_3=There is an Air Pocket behind this Rock. -item.GT_Hammer.tip_4=materials is changing behind this Rock. +item.GT_Hammer.tip_4=Material is changing behind this Rock. item.GT_Hammer.tip_5=Found traces of %s Ore. item.GT_Hammer.tip_6=No Ores found. item.GT_Lava_Filter.name=Lava Filter @@ -1061,7 +1062,7 @@ gregtech.tool.hammer.ore.2=No Ores found. gregtech.tool.hammer.lava=There is Lava behind this Rock. gregtech.tool.hammer.liquid=There is a Liquid behind this Rock. gregtech.tool.hammer.air=There is an Air Pocket behind this Rock. -gregtech.tool.hammer.diff=Material is changing behind this Rock. +gregtech.tool.hammer.diff=Material is hiding behind this Rock. itemGroup.gregtech=GregTech Intergalactical itemGroup.gregtech_materials=GregTech Materials @@ -1077,8 +1078,6 @@ sensor.nodata=No data nei.alloy_smelter.title=Alloy Smelter nei.assembler.title=Assembling Machine nei.bender.title=Plate Bending Machine -nei.bender.info.1=Circuits optional -nei.bender.info.2=but recommended! nei.blast_furnance.title=Industrial Blast Furnace nei.bronze_blast_furnance.title=Bronze Blast Furnace nei.blast_furnance.info=Heat Capacity: %sK