Minor updates

Nothing special really
bs2609 · Jun 4, 2015 · 262ce23 · 262ce23
1 parent 6c8f340
commit 262ce23
Show file tree

Hide file tree

Showing 36 changed files with 488 additions and 133 deletions.
diff --git a/config/AppliedEnergistics2/Facades.cfg b/config/AppliedEnergistics2/Facades.cfg
@@ -2582,11 +2582,13 @@ rftools {
     B:matterBoosterBlock=true
     B:matterReceiverBlock=false
     B:matterTransmitterBlock=false
+    B:modularStorageBlock=false
     B:pearlInjectorBlock=false
     B:proxyBlock=false
     B:redstoneReceiverBlock=false
     B:redstoneTransmitterBlock=false
     B:relayBlock=false
+    B:remoteStorageBlock=false
     B:rfMonitorBlock=false
     B:screenBlock=false
     B:screenControllerBlock=false
@@ -3198,8 +3200,21 @@ twilightforest {
     B:tileAuroraDoubleSlab=true
     B:tileAuroraPillar=true
     B:tileAuroraSlab=false
+    B:tileCastleBrick=true
+    B:tileCastleBrick.1=true
+    B:tileCastleBrick.2=true
+    B:tileCastleBrick.3=true
+    B:tileCastleMagic=true
+    B:tileCastleMagic.1=true
+    B:tileCastleMagic.2=true
+    B:tileCastleMagic.3=true
     B:tileDarkLeaves=true
     B:tileFluffyCloud=true
+    B:tileForceField=false
+    B:tileForceField.1=false
+    B:tileForceField.2=false
+    B:tileForceField.3=false
+    B:tileForceField.4=false
     B:tileGiantCobble=true
     B:tileGiantLeaves=false
     B:tileGiantLog=true
@@ -3209,6 +3224,10 @@ twilightforest {
     B:tileHugeStalk=true
     B:tileHugeWaterLily=false
     B:tileKnightmetalBlock=false
+    B:tileSlider=false
+    B:tileSlider.1=false
+    B:tileSlider.2=false
+    B:tileSlider.3=false
     B:tileTFAuroraBrick=true
     B:tileTFBurntThorns=false
     B:tileTFCicada=false

diff --git a/config/ExtraUtilities.cfg b/config/ExtraUtilities.cfg
@@ -63,6 +63,7 @@ items {
     B:DivisionSigilEnabled=true
     B:ErosionShovelEnabled=true
     B:EthericSwordEnabled=true
+    B:GloveEnabled=true
     B:GoldenBagEnabled=true
     B:GoldenLassoEnabled=true
     B:HealingAxeEnabled=true

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)
-#Mon May 11 16:52:04 BST 2015
+#Thu Jun 04 16:05:46 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.ObsidianTNT",
+    "entityName": "Mekanism.Robit",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Mekanism.Robit",
+    "entityName": "Mekanism.ObsidianTNT",
     "_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.Rocket",
+    "entityName": "MineFactoryReloaded.SafariNet",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "MineFactoryReloaded.SafariNet",
+    "entityName": "MineFactoryReloaded.Rocket",
     "_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.FlameSpider",
+    "entityName": "Natura.Imp",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Natura.Imp",
+    "entityName": "Natura.FlameSpider",
     "_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.Player-Magnet",
+    "entityName": "OpenBlocks.MiniMe",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "OpenBlocks.MiniMe",
+    "entityName": "OpenBlocks.Player-Magnet",
     "_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": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "OpenBlocks.Block",
+    "entityName": "OpenBlocks.Hang Glider",
     "_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.cart.gift",
+    "entityName": "Railcraft.railcraft.cart.chest",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.chest",
+    "entityName": "Railcraft.cart.gift",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -162,21 +162,21 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.pumpkin",
+    "entityName": "MinecartTNT",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "MinecartTNT",
+    "entityName": "Railcraft.cart.pumpkin",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.ItemFireproof",
+    "entityName": "Railcraft.railcraft.cart.tnt.wood",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -190,7 +190,7 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.tnt.wood",
+    "entityName": "Railcraft.ItemFireproof",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -218,35 +218,35 @@
   },
   {
     "_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.track.layer",
+    "entityName": "Railcraft.railcraft.cart.gift",
     "_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.work",
+    "entityName": "Railcraft.railcraft.cart.track.layer",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.bore",
+    "entityName": "Railcraft.cart.bore",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -260,7 +260,7 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.bore",
+    "entityName": "Railcraft.railcraft.cart.bore",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -274,28 +274,28 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.tank",
+    "entityName": "Railcraft.cart.loco.steam.solid",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_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.hopper",
+    "entityName": "MinecartFurnace",
     "_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": {}
@@ -309,14 +309,14 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.railcraft.cart.tnt",
+    "entityName": "Railcraft.cart.track.remover",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Railcraft.cart.track.remover",
+    "entityName": "Railcraft.railcraft.cart.tnt",
     "_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.KingSlime",
+    "entityName": "TConstruct.EdibleSlime",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -78,7 +78,7 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "TConstruct.EdibleSlime",
+    "entityName": "TConstruct.KingSlime",
     "_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.FrostShard",
+    "entityName": "Thaumcraft.EldritchCrab",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.BottleTaint",
+    "entityName": "Thaumcraft.FrostShard",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.EldritchCrab",
+    "entityName": "Thaumcraft.BottleTaint",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
@@ -337,14 +337,14 @@
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.ThaumSlime",
+    "entityName": "Thaumcraft.PrimalArrow",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}
   },
   {
     "_HEADER": "*****************************************",
-    "entityName": "Thaumcraft.PrimalArrow",
+    "entityName": "Thaumcraft.ThaumSlime",
     "_FOOTER": "*****************************************",
     "_COMMENT": "Aspects are in the form aspect : value ",
     "aspects": {}