Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala

.travis.yml

@@ -0,0 +1,11 @@
+language: scala
+scala: 2.11.1
+jdk: openjdk7
+
+notifications:
+  email: false
+env:
+  global: TERM=dumb
+
+install: ./gradlew setupCIWorkspace
+script: ./gradlew build

build.gradle

@@ -86,8 +86,6 @@ minecraft {
 
     replaceIn "li/cil/oc/OpenComputers.scala"
     replace "@VERSION@", project.simpleVersion
-    if (project.hasProperty("keystore_fingerprint"))
-        replace "@FINGERPRINT@", keystore_fingerprint
 }
 
 processResources {

src/main/scala/li/cil/oc/OpenComputers.scala

@@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager
 import scala.collection.convert.WrapAsScala._
 
 @Mod(modid = OpenComputers.ID, name = OpenComputers.Name,
-  version = OpenComputers.Version, /* certificateFingerprint = OpenComputers.Fingerprint, */
+  version = OpenComputers.Version,
   modLanguage = "scala", useMetadata = true)
 object OpenComputers {
   final val ID = "OpenComputers"
@@ -22,8 +22,6 @@ object OpenComputers {
 
   final val Version = "@VERSION@"
 
-  final val Fingerprint = "@FINGERPRINT@"
-
   var log = LogManager.getLogger("OpenComputers")
 
   @SidedProxy(clientSide = "li.cil.oc.client.Proxy", serverSide = "li.cil.oc.server.Proxy")
@@ -31,11 +29,6 @@ object OpenComputers {
 
   var channel: FMLEventChannel = _
 
-  var tampered: Option[FMLFingerprintViolationEvent] = None
-
-//  @EventHandler
-//  def invalidFingerprint(e: FMLFingerprintViolationEvent) = tampered = Some(e)
-
   @EventHandler
   def preInit(e: FMLPreInitializationEvent) {
     proxy.preInit(e)

src/main/scala/li/cil/oc/common/EventHandler.scala

@@ -97,10 +97,6 @@ object EventHandler {
         if (!Settings.get.pureIgnorePower && Settings.get.ignorePower) {
           player.addChatMessage(Localization.Chat.WarningPower)
         }
-        OpenComputers.tampered match {
-          case Some(event) => player.addChatMessage(Localization.Chat.WarningFingerprint(event))
-          case _ =>
-        }
         ServerPacketSender.sendPetVisibility(None, Some(player))
         // Do update check in local games and for OPs.
         if (!Mods.VersionChecker.isAvailable && (!MinecraftServer.getServer.isDedicatedServer || MinecraftServer.getServer.getConfigurationManager.func_152596_g(player.getGameProfile))) {