tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan C. Brady 2014-03-15 20:32:29 -04:00
commit 92cfba7308
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/mekanism/common/item/ItemFilterCard.java
View file

@ -46,7 +46,7 @@ public class ItemFilterCard extends ItemMekanism
{
data.setString("dataType", ((IFilterAccess)tileEntity).getDataType());
setData(stack, data);
player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.filterCard.got") + " " + EnumColor.INDIGO + MekanismUtils.localize(data.getString("dataType")));
player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(data.getString("dataType")) + EnumColor.GREY));
}
return true;
@ -56,7 +56,7 @@ public class ItemFilterCard extends ItemMekanism
if(((IFilterAccess)tileEntity).getDataType().equals(getDataType(stack)))
{
((IFilterAccess)tileEntity).setFilterData(getData(stack));
player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.filterCard.set") + " " + EnumColor.INDIGO + MekanismUtils.localize(getDataType(stack)));
player.addChatMessage(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN));
setData(stack, null);
}
else {

7
common/mekanism/common/item/ItemProxy.java
View file

@ -87,11 +87,10 @@ public class ItemProxy extends Item
if (par3Entity instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer) par3Entity;
for (Object o : player.inventoryContainer.inventorySlots)
for (int i = 0; i < player.inventory.mainInventory.length; i++)
{
Slot s = (Slot) o;
if (s.getStack() != null && s.getStack().getItem() == this)
player.inventory.decrStackSize(s.slotNumber, 64);
if (player.inventory.mainInventory[i] != null && player.inventory.mainInventory[i].getItem() == this)
player.inventory.mainInventory[i] = null;
}
}
}

15
resources/assets/mekanism/lang/de_DE.lang
View file

@ -33,6 +33,7 @@ item.Salt.name=Salz
item.BrineBucket.name=Eimer mit Salzwasser
item.FreeRunners.name=Freiläufer
item.ArmoredJetpack.name=Panzer-Jetpack
item.FilterCard.name=Filterkarte
//Gas Tank
tile.GasTank.GasTank.name=Gastank
@ -250,6 +251,7 @@ gui.status=Status
gui.autoEject=Auto-Auswerfen
gui.itemstack=ItemStack
gui.oredict=OreDict
gui.material=Material
gui.out=Out
gui.noFluid=Keine Flüssigk.
gui.empty=Leer
@ -266,6 +268,8 @@ gui.on=An
gui.off=Aus
gui.filters=Filter
gui.idle=Bereit
gui.data=Daten
gui.newFilter=Neuer Filter
gui.chemicalInfuser.short=C. Infundierer
gui.chemicalDissolutionChamber.short=C. Auflösungsk.
@ -288,6 +292,8 @@ gui.factory.purifying=Purifizieren
gui.factory.injecting=Injezieren
gui.factory.autoSort=Auto-Sortieren
gui.filterSelect.title=Neuen Filter kreieren
gui.oredictFilter=OreDict-Filter
gui.oredictFilter.noKey=Keine Kennung eingegeben
gui.oredictFilter.sameKey=Selbes Kennwort
@ -298,6 +304,9 @@ gui.itemFilter.details=ItemStack-Details
gui.itemFilter.min=Min
gui.itemFilter.max=Max
gui.materialFilter=Materialfilter
gui.materialFilter.details=Nutze Material von
gui.portableTeleporter=Tragbarer Teleporter
gui.teleporter.notReady=Nicht bereit
@ -356,6 +365,12 @@ tooltip.configurator.noLink=Kein Link
tooltip.configurator.linkMsg=Verbunden mit
tooltip.configurator.dim=Dimension
tooltip.filterCard.got=Filterdaten von %s empfangen
tooltip.filterCard.set=Filterdaten vom Typ %s injeziert
tooltip.filterCard.unequal=Ungleiche Filter-Dateiformate
tooltip.filterCard.logisticalSorter=Logistischer Sortierer
tooltip.filterCard.digitalMiner=Digitalbergbaugerät
tooltip.balloon=Ballon
tooltip.jetpack.regular=Regulär

4
resources/assets/mekanism/lang/en_US.lang
View file

@ -373,8 +373,8 @@ tooltip.configurator.noLink=No link
tooltip.configurator.linkMsg=Bound to
tooltip.configurator.dim=dimension
tooltip.filterCard.got=Retrieved filter data from
tooltip.filterCard.set=Injected filter data of type
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