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

Merge branch 'development' into 1.8

Browse source
This commit is contained in:
Aidan C. Brady 2014-08-19 19:08:47 -04:00
commit 6b4ef3bb50
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/mekanism/common/EnergyNetwork.java
View file

@ -141,17 +141,15 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
double sent = 0;
boolean tryAgain = false;
int i = 0;
do {
tryAgain = false;
double prev = sent;
sent += doEmit(energyToSend-sent, tryAgain);
if(energyToSend-sent > 0 && sent-prev > 0)
{
tryAgain = true;
}
tryAgain = energyToSend-sent > 0 && sent-prev > 0 && i < 100;
i++;
} while(tryAgain);
joulesTransmitted = sent;

6
src/main/java/mekanism/common/OreDictCache.java
View file

@ -6,7 +6,6 @@ import java.util.List;
import mekanism.api.util.ItemInfo;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@ -56,6 +55,11 @@ public final class OreDictCache
for(String s : OreDictionary.getOreNames())
{
if(s == null)
{
continue;
}
if(oreName.equals(s) || oreName.equals("*"))
{
keys.add(s);