Merge branch 'master' of https://github.com/Nukepowered/GregTech4 into master

This commit is contained in:
TheDarkDnKTv 2021-03-08 04:36:27 +02:00
commit 04764f45e0

View file

@ -314,7 +314,7 @@ 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 Sronze 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 pipe
metatileentity.GT_Pipe_TungstenSteel_Small.name=Small Tungstensteel pipe
@ -1414,7 +1414,7 @@ item.durability.tooltip=Durability: %d / %d
item.GT_SensorCard_Item.tooltip=Insert into Display Panel
item.GT_SensorCard_Item.tooltip.info.1=Device at:
item.GT_SensorCard_Item.tooltip.info.2=x: %d y: %d z: %d
item.GT_SensorCard_Item.tooltip.info.missing=Missing Coodinates!
item.GT_SensorCard_Item.tooltip.info.missing=Missing Coordinates!
metatileentity.GT_MetaTileEntity_BasicGenerator.tooltip=Generating: %d EU
metatileentity.machines.input_allow=Input from Output Side allowed