diff --git a/Change Log.txt b/Change Log.txt index 8c6019da..e450cb10 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -3,7 +3,8 @@ -draconic sword and staff of power now have an unlimited hit rate. (that was supposed to be a thing from the beginning) -increased the energy cost of the shields last stand ability from 5M RF to 10M RF. -added support for Avaritia's "Sword of the Cosmos" It will now deal a significant amount of damage to the draconic shield. As it should. --Note to devs. Please try to avoid bypassing the vanilla damage system. If you want your extremely expensive op weapon to deal a lot of damage then just make it deal a lot of damage. +-Note to devs. Please try to avoid bypassing the vanilla damage system. If you want your extremely expensive op weapon to deal a lot of damage then just make it deal a lot of damage. +-fixed WAILA localization for the energy core. ######## 1.0.2 ######## -fixed HUD not working with Dual Hotbars installed. diff --git a/VERSION.txt b/VERSION.txt index 3b7e0e5a..8519e68f 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,3 @@ -Version:1.0.2 +Version:1.0.2a Snapshot:0 -ReleaseNote:1.0.2 finally finished! +ReleaseNote:Just some minor tweaks. diff --git a/build.properties b/build.properties index 435dbe0e..34aea76f 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -mod_version=1.0.2 +mod_version=1.0.2a forge_version=10.13.4.1558-1.7.10 CCLIB_version=1.1.3.140 NEI_version=1.0.3.74 diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java index 4b8a6111..4e44badd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java @@ -227,4 +227,9 @@ public class InvisibleMultiblock extends BlockDE implements IHudDisplayBlock { return list; } + + @Override + public String getUnlocalizedName() { + return super.getUnlocalizedName(); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index f88c8d76..a71b1573 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -499,7 +499,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur @Override public float getFlightSpeedModifier(ItemStack stack, EntityPlayer player) { if (IConfigurableItem.ProfileHelper.getBoolean(stack, "EffectiveOnSprint", false)){ - return player.isSprinting() ? IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorFlightSpeedMult", 0f) : 0F; + return BrandonsCore.proxy.isCtrlDown() ? IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorFlightSpeedMult", 0f) : 0F; } else return IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorFlightSpeedMult", 0f); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java index 5875c4a7..aa99cefd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -5,7 +5,7 @@ package com.brandon3055.draconicevolution.common.lib; */ public class VersionHandler { - public static final String VERSION = "1.0.2"; + public static final String VERSION = "1.0.2a"; public static final int SNAPSHOT = 0; public static final String MCVERSION = "1.7.10"; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java index be6a0d6b..99cdae58 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java @@ -74,11 +74,11 @@ public class TileParticleGenerator extends TileEntity implements IDEPeripheral { private int tick = 0; - @SideOnly(Side.SERVER) - @Override - public boolean canUpdate() { - return false; - } + @SideOnly(Side.SERVER) + @Override + public boolean canUpdate() { + return false; + } @SideOnly(Side.CLIENT) @Override diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 0e19e729..ac3e1ace 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -15,6 +15,7 @@ tile.draconicevolution:longRangeDislocator1.name=Admin Dislocator tile.draconicevolution:longRangeDislocator0.name=Long Range Dislocator tile.draconicevolution:generator.name=Generator tile.draconicevolution:energyStorageCore.name=Energy Core +tile.draconicevolution:invisibleMultiblock.name=Energy Core tile.draconicevolution:energyPylon.name=Energy Pylon tile.draconicevolution:draconium0.name=Draconium Block tile.draconicevolution:draconium1.name=Resurrection Stone