Merge pull request #27 from sandalle/master

Modderation config files updated for 1.1.4c

Author: sandalle

config/OpenComputers.cfg

@@ -1346,6 +1346,6 @@ opencomputers {
   # The version of OC this config was generated by. This is used to allow the
   # mod to reset parts of the config when their meaning changed across
   # versions, so that the user does not have to delete it.
-  version="1.5.13.28"
+  version="1.5.14.30"
 
 }

config/UniqueNames.txt

@@ -1,4 +1,4 @@
-# generated by bspkrsCore 20150710 18:15:58
+# generated by bspkrsCore 20150712 13:00:28
 
 **********************************************
 *  ####   #       ###    ###   #   #   ####  *
@@ -1034,6 +1034,7 @@ OpenComputers:hologram2
 OpenComputers:keyboard
 OpenComputers:microcontroller
 OpenComputers:motionSensor
+OpenComputers:netSplitter
 OpenComputers:powerConverter
 OpenComputers:powerDistributor
 OpenComputers:print
@@ -4402,6 +4403,7 @@ OpenComputers:item
 OpenComputers:keyboard
 OpenComputers:microcontroller
 OpenComputers:motionSensor
+OpenComputers:netSplitter
 OpenComputers:powerConverter
 OpenComputers:powerDistributor
 OpenComputers:print

config/cofh/core/common.cfg

@@ -7,28 +7,28 @@ Enchantment {
 
 
 General {
-    # Set to true this to log when a block is dismantled.
+    # Set to TRUE for this to log when a block is dismantled.
     B:EnableDismantleLogging=false
 
-    # Set to true to display death messages for any named entity.
+    # Set to TRUE to display death messages for any named entity.
     B:EnableGenericDeathMessage=true
 
-    # Set to false to disable items on the ground from trying to stack. This can improve server performance.
+    # Set to FALSE to disable items on the ground from trying to stack. This can improve server performance.
     B:EnableItemStacking=true
 
-    # Set to true to be informed of non-critical updates. You will still receive critical update notifications.
+    # Set to TRUE to be informed of non-critical updates. You will still receive critical update notifications.
     B:EnableUpdateNotifications=false
 }
 
 
 Security {
-    # Set to true to allow for Server Ops to access 'secure' blocks. Your players will be warned upon server connection.
+    # Set to TRUE to allow for Server Ops to access 'secure' blocks. Your players will be warned upon server connection.
     B:OpsCanAccessSecureBlocks=false
 }
 
 
 Version {
-    S:Identifier=1.7.10R3.0.3B2
+    S:Identifier=1.7.10R3.0.3B4
 }
 
 

config/cofh/thermaldynamics/common.cfg

@@ -68,7 +68,7 @@ Duct {
 
 
 Version {
-    S:Identifier=1.7.10R1.1.0B2
+    S:Identifier=1.7.10R1.1.0B4
 }
 
 

config/cofh/thermalexpansion/common.cfg

@@ -127,6 +127,15 @@ Ender {
 
     Tesseract {
         B:Recipe.Enable=true
+
+        # If FALSE, disables the Tesseract Frames recipes, if Tesseracts are ALSO disabled.
+        B:Recipe.Frame=true
+
+        # If FALSE, hides the Tesseract, if the recipe is ALSO disabled.
+        B:Show.Block=true
+
+        # If FALSE, hides the Tesseract Frames, if their recipes are ALSO disabled.
+        B:Show.Frame=true
     }
 
 }
@@ -366,14 +375,6 @@ Plate {
         B:Recipe.Enable=true
     }
 
-    Charge {
-        B:Recipe.Enable=true
-    }
-
-    Teleport {
-        B:Recipe.Enable=true
-    }
-
 }
 
 
@@ -485,6 +486,7 @@ RecipeManagers {
             B:MossyCobblestone=true
             B:MossyStoneBrick=true
             B:NetherBrick=false
+            B:PackedIce=true
         }
 
     }
@@ -667,7 +669,7 @@ Tank {
 
 
 Version {
-    S:Identifier=1.7.10R4.0.2B2
+    S:Identifier=1.7.10R4.0.2B3
 }
 
 

config/cofh/thermalfoundation/common.cfg

@@ -223,9 +223,12 @@ Fluid {
     }
 
     Petrotheum {
-        # Enable this for Fluid Petrotheum to make things more in tune with the earth.
+        # Enable this for Fluid Petrotheum to break apart stone blocks.
         B:Effect=true
 
+        # Enable this for Fluid Petrotheum to have an EXTREME effect on stone blocks.
+        B:Effect.Extreme=false
+
         # Enable this for Fluid Petrotheum Source blocks to gradually fall downwards.
         B:Fall=true
     }
@@ -243,6 +246,12 @@ Fluid {
 }
 
 
+Holiday {
+    # Set this to TRUE to disable April Foolishness.
+    B:IHateApril=false
+}
+
+
 Lexicon {
     # This option will generate a fresh blacklist or whitelist EVERY time. This is not recommended, but is provided here as an option if you are satisfied with the defaults.
     B:AlwaysGenerateList=false
@@ -443,7 +452,7 @@ Plugins {
 
 
 Version {
-    S:Identifier=1.7.10R1.2.0B1
+    S:Identifier=1.7.10R1.2.0B2
 }
 
 

config/opencomputers/default.recipes

@@ -576,6 +576,11 @@ motionSensor {
           [daylightDetector, "oc:cpu2", daylightDetector]
           [ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]]
 }
+netSplitter {
+  input: [[ingotIron, "oc:cable", ingotIron]
+          ["oc:cable", craftingPiston, "oc:cable"]
+          [ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
+}
 printer {
   input: [[ingotIron, hopper, ingotIron]
           [craftingPiston, "oc:circuitChip3", craftingPiston]