diff --git a/src/main/java/refinedstorage/item/ItemNetworkCard.java b/src/main/java/refinedstorage/item/ItemNetworkCard.java index 8edbe2cdc..61cd73b12 100755 --- a/src/main/java/refinedstorage/item/ItemNetworkCard.java +++ b/src/main/java/refinedstorage/item/ItemNetworkCard.java @@ -46,9 +46,7 @@ public class ItemNetworkCard extends ItemBase { BlockPos pos = getReceiver(stack); if (pos != null) { - tooltip.add(I18n.format("misc.refinedstorage:network_card.tooltip.0", pos.getX())); - tooltip.add(I18n.format("misc.refinedstorage:network_card.tooltip.1", pos.getY())); - tooltip.add(I18n.format("misc.refinedstorage:network_card.tooltip.2", pos.getZ())); + tooltip.add(I18n.format("misc.refinedstorage:network_card.tooltip", pos.getX(), pos.getY(), pos.getZ())); } } diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index b4765380f..57c8b3bf7 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -112,9 +112,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle } if (hasValidNBT(stack)) { - tooltip.add(I18n.format("misc.refinedstorage:wireless_grid.tooltip.0", getX(stack))); - tooltip.add(I18n.format("misc.refinedstorage:wireless_grid.tooltip.1", getY(stack))); - tooltip.add(I18n.format("misc.refinedstorage:wireless_grid.tooltip.2", getZ(stack))); + tooltip.add(I18n.format("misc.refinedstorage:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack))); } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index d50ddd128..f92444ed5 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -36,7 +36,6 @@ gui.refinedstorage:network_transmitter.distance=%d blocks gui.refinedstorage:network_transmitter.missing_card=Missing Network Card gui.refinedstorage:network_transmitter.missing_receiver=Receiver not found gui.refinedstorage:network_transmitter.different_dimension=Different dimension -gui.refinedstorage:network_receiver=Network Receiver misc.refinedstorage:energy_stored=%d / %d RS misc.refinedstorage:energy_usage=Usage: %d RS/t @@ -48,15 +47,11 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% full -misc.refinedstorage:wireless_grid.tooltip.0=X: %d -misc.refinedstorage:wireless_grid.tooltip.1=Y: %d -misc.refinedstorage:wireless_grid.tooltip.2=Z: %d +misc.refinedstorage:wireless_grid.tooltip=Linked to %d, %d, %d. misc.refinedstorage:wireless_grid.out_of_range=There is no Wireless Transmitter in range. misc.refinedstorage:wireless_grid.not_found=Controller not found. -misc.refinedstorage:network_card.tooltip.0=X: %d -misc.refinedstorage:network_card.tooltip.1=Y: %d -misc.refinedstorage:network_card.tooltip.2=Z: %d +misc.refinedstorage:network_card.tooltip=Linked to %d, %d, %d. misc.refinedstorage:pattern.inputs=Inputs misc.refinedstorage:pattern.outputs=Outputs diff --git a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang index 87d64dc37..5790ddb16 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang @@ -41,9 +41,6 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% plein -misc.refinedstorage:wireless_grid.tooltip.0=X: %d -misc.refinedstorage:wireless_grid.tooltip.1=Y: %d -misc.refinedstorage:wireless_grid.tooltip.2=Z: %d misc.refinedstorage:wireless_grid.out_of_range=Il n'y a pas un Émetteur sans Fil dans la gamme. misc.refinedstorage:wireless_grid.not_found=Contrôleur non trouvé. diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 7e06994ae..90a9ae7d9 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -36,7 +36,6 @@ gui.refinedstorage:network_transmitter.distance=%d blokken gui.refinedstorage:network_transmitter.missing_card=Geen Netwerkkaart gui.refinedstorage:network_transmitter.missing_receiver=Ontvanger niet gevonden gui.refinedstorage:network_transmitter.different_dimension=Andere dimensie -gui.refinedstorage:network_receiver=Netwerkontvanger misc.refinedstorage:energy_stored=%d / %d RS misc.refinedstorage:energy_usage=Vebruik: %d RS/t @@ -48,15 +47,11 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% vol -misc.refinedstorage:wireless_grid.tooltip.0=X: %d -misc.refinedstorage:wireless_grid.tooltip.1=Y: %d -misc.refinedstorage:wireless_grid.tooltip.2=Z: %d +misc.refinedstorage:wireless_grid.tooltip=Gelinkt aan %d, %d, %d. misc.refinedstorage:wireless_grid.out_of_range=Er is geen Draadloze Zender binnen bereik. misc.refinedstorage:wireless_grid.not_found=Controller niet gevonden. -misc.refinedstorage:network_card.tooltip.0=X: %d -misc.refinedstorage:network_card.tooltip.1=Y: %d -misc.refinedstorage:network_card.tooltip.2=Z: %d +misc.refinedstorage:network_card.tooltip=Gelinkt aan %d, %d, %d. misc.refinedstorage:pattern.inputs=Inputs misc.refinedstorage:pattern.outputs=Outputs diff --git a/src/main/resources/assets/refinedstorage/lang/pt_BR.lang b/src/main/resources/assets/refinedstorage/lang/pt_BR.lang index 7aaece026..bc743fd86 100755 --- a/src/main/resources/assets/refinedstorage/lang/pt_BR.lang +++ b/src/main/resources/assets/refinedstorage/lang/pt_BR.lang @@ -41,9 +41,6 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% full -misc.refinedstorage:wireless_grid.tooltip.0=X: %d -misc.refinedstorage:wireless_grid.tooltip.1=Y: %d -misc.refinedstorage:wireless_grid.tooltip.2=Z: %d misc.refinedstorage:wireless_grid.out_of_range=Não há Transmissor Sem Fio na gama. misc.refinedstorage:wireless_grid.not_found=Controlador não encontrado.