New update

Mainly updates for Applied Energistics 2 and related mods, handful of other small updates too.
bs2609 · May 11, 2015 · 6c8f340 · 6c8f340
1 parent cb3c7e7
commit 6c8f340
Show file tree

Hide file tree

Showing 32 changed files with 214 additions and 125 deletions.
diff --git a/config/AppliedEnergistics2/AppliedEnergistics2.cfg b/config/AppliedEnergistics2/AppliedEnergistics2.cfg
@@ -16,7 +16,7 @@ battery {
 
 
 client {
-    # Possible Values: AE, MJ, EU, WA, RF, MK
+    # Possible Values: AE, EU, WA, RF, MK
     S:PowerUnit=AE
 
     # Possible Values: AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH

diff --git a/config/AppliedEnergistics2/Facades.cfg b/config/AppliedEnergistics2/Facades.cfg
@@ -703,6 +703,8 @@ extracells {
     B:certustank=false
     B:ecbaseblock=false
     B:fluidcrafter=false
+    B:hardmedrive=false
+    B:vibrantchamberfluid=false
     B:walrus=false
 }
 
@@ -2540,6 +2542,7 @@ redstonearsenal {
 rftools {
     B:activityProbeBlock=true
     B:biomeAbsorberBlock=false
+    B:blockProtectorBlock=false
     B:counterBlock=false
     B:crafterBlock1=false
     B:crafterBlock2=false

diff --git a/config/AppliedEnergistics2/extracells.cfg b/config/AppliedEnergistics2/extracells.cfg
@@ -1,5 +1,20 @@
 # Configuration file
 
+integration {
+    # Enable BuildCraftFuel Integration.
+    B:enableBuildCraftFuel=true
+
+    # Enable NotEnoughItems Integration.
+    B:enableNotEnoughItems=true
+
+    # Enable OpenComputers Integration.
+    B:enableOpenComputers=true
+
+    # Enable Waila Integration.
+    B:enableWaila=true
+}
+
+
 "storage cells" {
     # Should the mount of bytes needed for a new type depend on the cellsize?
     B:dynamicTypes=true

diff --git a/config/ExtraUtilities.cfg b/config/ExtraUtilities.cfg
@@ -87,7 +87,9 @@ options {
     I:deepDarkDimensionID=-100
     B:disableEnderPumpInAllDimensions=false
     B:disableMultiBlocksCreativeTab=false
+    B:disableTransferNodeCobblegen=false
     B:disableTransferNodeParticles=false
+    B:disableTransferNodeWatergen=false
     B:disableWitherNoisesIfNotNearby=true
     I:lastMilleniumDimensionID=-112
     B:peacefulTableInAllDifficulties=false

diff --git a/config/InvTweaks.cfg b/config/InvTweaks.cfg
@@ -1,6 +1,6 @@
 #Inventory Tweaks Configuration
 #(Regarding shortcuts, all key names can be found at: http://www.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
-#Wed Apr 29 18:36:09 BST 2015
+#Mon May 11 16:52:04 BST 2015
 enableMiddleClick=true
 showChestButtons=true
 enableSortingOnPickup=false

diff --git a/config/ThaumcraftMobAspects/Mekanism.cfg b/config/ThaumcraftMobAspects/Mekanism.cfg
@@ -1,14 +1,14 @@
 [
   {
     "_HEADER": "*****************************************",
-    "entityName": "Mekanism.Robit",
+    "entityName": "Mekanism.ObsidianTNT",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Mekanism.ObsidianTNT",
+    "entityName": "Mekanism.Robit",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}

diff --git a/config/ThaumcraftMobAspects/MineFactoryReloaded.cfg b/config/ThaumcraftMobAspects/MineFactoryReloaded.cfg
@@ -29,14 +29,14 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "MineFactoryReloaded.SafariNet",
+    "entityName": "MineFactoryReloaded.Rocket",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "MineFactoryReloaded.Rocket",
+    "entityName": "MineFactoryReloaded.SafariNet",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}

diff --git a/config/ThaumcraftMobAspects/Natura.cfg b/config/ThaumcraftMobAspects/Natura.cfg
@@ -15,14 +15,14 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Natura.Imp",
+    "entityName": "Natura.FlameSpider",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Natura.FlameSpider",
+    "entityName": "Natura.Imp",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}

diff --git a/config/ThaumcraftMobAspects/OpenBlocks.cfg b/config/ThaumcraftMobAspects/OpenBlocks.cfg
@@ -50,28 +50,28 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "OpenBlocks.MiniMe",
+    "entityName": "OpenBlocks.Player-Magnet",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "OpenBlocks.Player-Magnet",
+    "entityName": "OpenBlocks.MiniMe",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "OpenBlocks.Block",
+    "entityName": "OpenBlocks.Hang Glider",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "OpenBlocks.Hang Glider",
+    "entityName": "OpenBlocks.Block",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}

diff --git a/config/ThaumcraftMobAspects/Railcraft.cfg b/config/ThaumcraftMobAspects/Railcraft.cfg
@@ -64,14 +64,14 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.chest",
+    "entityName": "Railcraft.cart.gift",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.gift",
+    "entityName": "Railcraft.railcraft.cart.chest",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -162,21 +162,21 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "MinecartTNT",
+    "entityName": "Railcraft.cart.pumpkin",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.pumpkin",
+    "entityName": "MinecartTNT",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.tnt.wood",
+    "entityName": "Railcraft.ItemFireproof",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -190,7 +190,7 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.ItemFireproof",
+    "entityName": "Railcraft.railcraft.cart.tnt.wood",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -218,35 +218,35 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.track.layer",
+    "entityName": "Railcraft.railcraft.cart.gift",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.gift",
+    "entityName": "Railcraft.cart.track.layer",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.work",
+    "entityName": "Railcraft.railcraft.cart.track.layer",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.track.layer",
+    "entityName": "Railcraft.cart.work",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.bore",
+    "entityName": "Railcraft.railcraft.cart.bore",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -260,7 +260,7 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.bore",
+    "entityName": "Railcraft.cart.bore",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -274,28 +274,28 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.loco.steam.solid",
+    "entityName": "Railcraft.railcraft.cart.tank",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.tank",
+    "entityName": "Railcraft.cart.loco.steam.solid",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "MinecartFurnace",
+    "entityName": "Railcraft.railcraft.cart.hopper",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.hopper",
+    "entityName": "MinecartFurnace",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -309,14 +309,14 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.track.remover",
+    "entityName": "Railcraft.railcraft.cart.tnt",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.tnt",
+    "entityName": "Railcraft.cart.track.remover",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}

diff --git a/config/ThaumcraftMobAspects/TConstruct.cfg b/config/ThaumcraftMobAspects/TConstruct.cfg
@@ -64,7 +64,7 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "TConstruct.EdibleSlime",
+    "entityName": "TConstruct.KingSlime",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -78,7 +78,7 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "TConstruct.KingSlime",
+    "entityName": "TConstruct.EdibleSlime",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}

diff --git a/config/ThaumcraftMobAspects/Thaumcraft.cfg b/config/ThaumcraftMobAspects/Thaumcraft.cfg
@@ -71,21 +71,21 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.EldritchCrab",
+    "entityName": "Thaumcraft.FrostShard",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.FrostShard",
+    "entityName": "Thaumcraft.BottleTaint",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.BottleTaint",
+    "entityName": "Thaumcraft.EldritchCrab",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -337,14 +337,14 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.PrimalArrow",
+    "entityName": "Thaumcraft.ThaumSlime",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.ThaumSlime",
+    "entityName": "Thaumcraft.PrimalArrow",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}