Merge branch '1.7.10' into development

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
This commit is contained in:
Ben Spiers committed 2014-07-07 15:43:53 +01:00
1 parent 786d399c2c
commit f0ad905c07
10 files changed
+43 -36

No files matched your search

@@ -81,7 +81,7 @@ public class RenderTickHandler
{
ItemStack stack = player.getEquipmentInSlot(3);
ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int x = scaledresolution.getScaledWidth();
int y = scaledresolution.getScaledHeight();
@@ -182,4 +182,4 @@ public class RenderTickHandler
mc.effectRenderer.addEffect(fx);
}
}
}
+2 -5
View File
@@ -157,8 +157,8 @@ import cpw.mods.fml.common.registry.GameRegistry;
*
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "7.0.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "required-after:Forge@[10.12.2.1147,); after:BuildCraft;after:IC2;after:CoFHCore;after:ComputerCraft;after:Galacticraft;" +
"after:MineFactoryReloaded;after:MetallurgyCore;after:Railcraft;after:Forestry")
dependencies = "after:BuildCraftAPI;after:IC2API;after:CoFHAPI|energy;after:ComputerCraft;after:Galacticraft API;" +
"after:MineFactoryReloaded;after:MetallurgyCore")
public class Mekanism
{
/** Mekanism Packet Pipeline */
@@ -596,9 +596,6 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 12), new Object[] {
"TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), "circuitBasic"
}));
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Blocks.rail, 24), new Object[] {
"O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood"
}));
for(RecipeType type : RecipeType.values())
{
@@ -78,8 +78,6 @@ public class PacketHandler
{
public SimpleNetworkWrapper netHandler = NetworkRegistry.INSTANCE.newSimpleChannel("MEK");
private int packetsRegistered = 0;
public void initialize()
{
netHandler.registerMessage(PacketRobit.class, RobitMessage.class, 0, Side.SERVER);
@@ -198,6 +198,6 @@ public class VoiceConnection extends Thread
public EntityPlayerMP getPlayer()
{
return server.getConfigurationManager().getPlayerForUsername(username);
return server.getConfigurationManager().func_152612_a(username); //TODO getPlayerForUsername
}
}