Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes

This commit is contained in:
SenseiKiwi 2013-12-24 00:36:32 -04:00
commit 65ed1de6ee
2 changed files with 3 additions and 3 deletions

View file

@ -23,8 +23,8 @@ minecraft {
version = "1.6.4-9.11.1.964"
}
targetCompatibility = '1.7'
sourceCompatibility = '1.7'
targetCompatibility = '1.6'
sourceCompatibility = '1.6'
processResources
{

View file

@ -94,7 +94,7 @@ serverPacketHandlerSpec =
@SidedPacketHandler(channels = {PacketConstants.CHANNEL_NAME}, packetHandler = ServerPacketHandler.class))
public class mod_pocketDim
{
public static final String version = "2.2.0";
public static final String version = "$VERSION$";
public static final String modid = "dimdoors";
//need to clean up