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

src/main/resources/application.conf

@@ -628,7 +628,7 @@ opencomputers {
 
           # The amount of energy the chunkloader upgrade draws per tick while
           # it is enabled, i.e. actually loading a chunk.
-          chunkloaderCost: 0.5
+          chunkloaderCost: 0.06
       }
   }
 

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

@@ -316,6 +316,11 @@ object Settings {
       "computer.ramSizes",
       "internet.blacklist",
       "internet.whitelist"
+    ),
+    // Upgrading to version 1.3.3, default power consumption of chunk loader
+    // reduced as discussed in #447.
+    VersionRange.createFromVersionSpec("[1.3.0,1.3.3)") -> Array(
+      "power.cost.chunkloaderCost"
     )
   )