diff --git a/config/InvTweaks.cfg b/config/InvTweaks.cfg index 1dd4c97..ed3af5d 100644 --- 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 Mar 04 16:14:15 GMT 2015 +#Thu Mar 05 17:56:59 GMT 2015 enableMiddleClick=true showChestButtons=true enableSortingOnPickup=false diff --git a/config/ThaumcraftMobAspects/Mekanism.cfg b/config/ThaumcraftMobAspects/Mekanism.cfg index c7a26ff..0b6fcc3 100644 --- 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 index ebb2465..683903a 100644 --- a/config/ThaumcraftMobAspects/MineFactoryReloaded.cfg +++ b/config/ThaumcraftMobAspects/MineFactoryReloaded.cfg @@ -22,14 +22,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 index 6aa1da3..0ad12f4 100644 --- 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 index a9ac70a..2ef6cb2 100644 --- a/config/ThaumcraftMobAspects/OpenBlocks.cfg +++ b/config/ThaumcraftMobAspects/OpenBlocks.cfg @@ -43,28 +43,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 index fef02ac..b885a67 100644 --- 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 index 0be109a..3587285 100644 --- 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 index 909b5bb..bbdf9d7 100644 --- a/config/ThaumcraftMobAspects/Thaumcraft.cfg +++ b/config/ThaumcraftMobAspects/Thaumcraft.cfg @@ -71,21 +71,21 @@ }, { "_HEADER": "*****************************************", - "entityName": "Thaumcraft.EldritchCrab", + "entityName": "Thaumcraft.BottleTaint", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_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": {} @@ -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": {} diff --git a/config/ThaumcraftMobAspects/TwilightForest.cfg b/config/ThaumcraftMobAspects/TwilightForest.cfg index 249fc8e..3431deb 100644 --- a/config/ThaumcraftMobAspects/TwilightForest.cfg +++ b/config/ThaumcraftMobAspects/TwilightForest.cfg @@ -99,38 +99,38 @@ "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { "lucrum": 7, - "perditio": 7, "aer": 7, + "perditio": 7, "ignis": 7, - "ordo": 7, - "aqua": 7, "tutamen": 7, + "aqua": 7, + "ordo": 7, "terra": 7 } }, { "_HEADER": "*****************************************", - "entityName": "TwilightForest.tffallingice", + "entityName": "TwilightForest.Hostile Wolf", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", - "aspects": {} + "aspects": { + "bestia": 3, + "terra": 3 + } }, { "_HEADER": "*****************************************", - "entityName": "TwilightForest.Yeti", + "entityName": "TwilightForest.tffallingice", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "TwilightForest.Hostile Wolf", + "entityName": "TwilightForest.Yeti", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", - "aspects": { - "bestia": 3, - "terra": 3 - } + "aspects": {} }, { "_HEADER": "*****************************************", @@ -166,17 +166,10 @@ "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { - "exanimis": 3, - "ignis": 2 + "ignis": 2, + "exanimis": 3 } }, - { - "_HEADER": "*****************************************", - "entityName": "TwilightForest.WinterWolf", - "_FOOTER": "*****************************************", - "_COMMENT": "Aspects are in the form aspect : value ", - "aspects": {} - }, { "_HEADER": "*****************************************", "entityName": "TwilightForest.Skeleton Druid", @@ -190,6 +183,13 @@ "humanus": 2 } }, + { + "_HEADER": "*****************************************", + "entityName": "TwilightForest.WinterWolf", + "_FOOTER": "*****************************************", + "_COMMENT": "Aspects are in the form aspect : value ", + "aspects": {} + }, { "_HEADER": "*****************************************", "entityName": "TwilightForest.Naga", @@ -197,12 +197,12 @@ "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { "venenum": 7, - "aer": 7, "perditio": 7, + "aer": 7, "ignis": 7, "bestia": 7, - "aqua": 7, "ordo": 7, + "aqua": 7, "terra": 7 } }, @@ -234,13 +234,13 @@ "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { "potentia": 7, - "aer": 7, "perditio": 7, + "aer": 7, "ignis": 7, "telum": 7, - "aqua": 7, - "ordo": 7, "cognitio": 7, + "ordo": 7, + "aqua": 7, "terra": 7 } }, @@ -308,16 +308,16 @@ "aspects": { "lucrum": 6, "herba": 6, - "aer": 6, "perditio": 6, + "aer": 6, "ignis": 6, "telum": 1, "bestia": 6, - "aqua": 6, "ordo": 6, + "aqua": 6, "terra": 6, - "humanus": 6, - "tenebrae": 6 + "tenebrae": 6, + "humanus": 6 } }, { @@ -438,8 +438,8 @@ "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { "spiritus": 2, - "cognitio": 3, - "vinculum": 1 + "vinculum": 1, + "cognitio": 3 } }, { @@ -462,8 +462,8 @@ "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { - "exanimis": 2, - "ignis": 1 + "ignis": 1, + "exanimis": 2 } }, { @@ -483,8 +483,8 @@ "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { "bestia": 3, - "gelum": 3, - "aqua": 2 + "aqua": 2, + "gelum": 3 } }, { @@ -507,14 +507,14 @@ "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { - "aer": 10, "perditio": 10, - "ignis": 10, + "aer": 10, "exanimis": 10, + "ignis": 10, "praecantatio": 10, - "aqua": 10, - "ordo": 10, "cognitio": 10, + "ordo": 10, + "aqua": 10, "terra": 10 } }, @@ -529,6 +529,13 @@ "bestia": 1 } }, + { + "_HEADER": "*****************************************", + "entityName": "TwilightForest.Unstable Ice Core", + "_FOOTER": "*****************************************", + "_COMMENT": "Aspects are in the form aspect : value ", + "aspects": {} + }, { "_HEADER": "*****************************************", "entityName": "TwilightForest.Minotaur", @@ -540,13 +547,6 @@ "terra": 3 } }, - { - "_HEADER": "*****************************************", - "entityName": "TwilightForest.Unstable Ice Core", - "_FOOTER": "*****************************************", - "_COMMENT": "Aspects are in the form aspect : value ", - "aspects": {} - }, { "_HEADER": "*****************************************", "entityName": "TwilightForest.Armored Giant", @@ -629,13 +629,13 @@ "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { - "perditio": 20, "aer": 10, - "ignis": 10, + "perditio": 20, "exanimis": 10, + "ignis": 10, "volatus": 10, - "ordo": 10, "aqua": 10, + "ordo": 10, "terra": 10 } }, @@ -646,6 +646,13 @@ "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, + { + "_HEADER": "*****************************************", + "entityName": "TwilightForest.Yeti Boss", + "_FOOTER": "*****************************************", + "_COMMENT": "Aspects are in the form aspect : value ", + "aspects": {} + }, { "_HEADER": "*****************************************", "entityName": "TwilightForest.Helmet Crab", @@ -659,7 +666,7 @@ }, { "_HEADER": "*****************************************", - "entityName": "TwilightForest.Yeti Boss", + "entityName": "TwilightForest.tfSeekerArrow", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} @@ -671,13 +678,6 @@ "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, - { - "_HEADER": "*****************************************", - "entityName": "TwilightForest.tfSeekerArrow", - "_FOOTER": "*****************************************", - "_COMMENT": "Aspects are in the form aspect : value ", - "aspects": {} - }, { "_HEADER": "*****************************************", "entityName": "TwilightForest.Swarm Spider", diff --git a/config/ThaumcraftMobAspects/appliedenergistics2.cfg b/config/ThaumcraftMobAspects/appliedenergistics2.cfg index 57244ee..e48e3f9 100644 --- a/config/ThaumcraftMobAspects/appliedenergistics2.cfg +++ b/config/ThaumcraftMobAspects/appliedenergistics2.cfg @@ -15,14 +15,14 @@ }, { "_HEADER": "*****************************************", - "entityName": "appliedenergistics2.EntitySingularity", + "entityName": "appliedenergistics2.EntityTinyTNTPrimed", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "appliedenergistics2.EntityTinyTNTPrimed", + "entityName": "appliedenergistics2.EntitySingularity", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} diff --git a/config/ThaumcraftMobAspects/crazypants.cfg b/config/ThaumcraftMobAspects/crazypants.cfg index 4ea0c30..bc4892a 100644 --- a/config/ThaumcraftMobAspects/crazypants.cfg +++ b/config/ThaumcraftMobAspects/crazypants.cfg @@ -8,14 +8,14 @@ }, { "_HEADER": "*****************************************", - "entityName": "soundEntity", + "entityName": "rangeEntity", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "rangeEntity", + "entityName": "soundEntity", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} diff --git a/config/ThaumcraftMobAspects/unknown.cfg b/config/ThaumcraftMobAspects/unknown.cfg index 9295b14..a40d59b 100644 --- a/config/ThaumcraftMobAspects/unknown.cfg +++ b/config/ThaumcraftMobAspects/unknown.cfg @@ -1,21 +1,21 @@ [ { "_HEADER": "*****************************************", - "entityName": "the_iguana_man", + "entityName": "XanderGryphon", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { "potentia": 5, - "aer": 5, - "perditio": 5, "spiritus": 5, + "perditio": 5, + "aer": 5, "ignis": 5, "praecantatio": 5, "fames": 5, "alienis": 5, - "aqua": 5, - "ordo": 5, "cognitio": 5, + "ordo": 5, + "aqua": 5, "victus": 5, "terra": 5, "humanus": 5 @@ -23,21 +23,21 @@ }, { "_HEADER": "*****************************************", - "entityName": "XanderGryphon", + "entityName": "the_iguana_man", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": { "potentia": 5, - "aer": 5, - "perditio": 5, "spiritus": 5, + "perditio": 5, + "aer": 5, "ignis": 5, "praecantatio": 5, "fames": 5, "alienis": 5, - "aqua": 5, - "ordo": 5, "cognitio": 5, + "ordo": 5, + "aqua": 5, "victus": 5, "terra": 5, "humanus": 5 diff --git a/config/ThaumcraftMobAspects/vanilla.cfg b/config/ThaumcraftMobAspects/vanilla.cfg index 5cba81e..09d1fe2 100644 --- a/config/ThaumcraftMobAspects/vanilla.cfg +++ b/config/ThaumcraftMobAspects/vanilla.cfg @@ -36,28 +36,28 @@ }, { "_HEADER": "*****************************************", - "entityName": "EntityHorse", + "entityName": "LavaSlime", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "LavaSlime", + "entityName": "EntityHorse", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "WitherBoss", + "entityName": "PigZombie", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "PigZombie", + "entityName": "WitherBoss", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} @@ -162,14 +162,14 @@ }, { "_HEADER": "*****************************************", - "entityName": "Villager", + "entityName": "Enderman", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "Enderman", + "entityName": "Villager", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} @@ -197,14 +197,14 @@ }, { "_HEADER": "*****************************************", - "entityName": "Skeleton", + "entityName": "Ghast", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "Ghast", + "entityName": "Skeleton", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} diff --git a/config/ThaumcraftMobAspects/vanillaitem.cfg b/config/ThaumcraftMobAspects/vanillaitem.cfg index 0264a6a..35c09ad 100644 --- a/config/ThaumcraftMobAspects/vanillaitem.cfg +++ b/config/ThaumcraftMobAspects/vanillaitem.cfg @@ -22,14 +22,14 @@ }, { "_HEADER": "*****************************************", - "entityName": "MinecartHopper", + "entityName": "XPOrb", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "XPOrb", + "entityName": "MinecartHopper", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} @@ -78,14 +78,14 @@ }, { "_HEADER": "*****************************************", - "entityName": "PrimedTnt", + "entityName": "EnderCrystal", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} }, { "_HEADER": "*****************************************", - "entityName": "EnderCrystal", + "entityName": "PrimedTnt", "_FOOTER": "*****************************************", "_COMMENT": "Aspects are in the form aspect : value ", "aspects": {} diff --git a/config/UniqueNames.txt b/config/UniqueNames.txt index 45f07ae..98c17a5 100644 --- a/config/UniqueNames.txt +++ b/config/UniqueNames.txt @@ -1,4 +1,4 @@ -# generated by bspkrsCore 20150304 16:14:18 +# generated by bspkrsCore 20150305 17:57:02 ********************************************** * #### # ### ### # # #### * diff --git a/config/cofh/core/common.cfg b/config/cofh/core/common.cfg index 83961ca..89caf5f 100644 --- a/config/cofh/core/common.cfg +++ b/config/cofh/core/common.cfg @@ -28,7 +28,7 @@ Security { Version { - S:Identifier=1.7.10R3.0.0RC3 + S:Identifier=1.7.10R3.0.0RC4 } diff --git a/config/cofh/thermaldynamics/common.cfg b/config/cofh/thermaldynamics/common.cfg index 910bfd3..3a802a5 100644 --- a/config/cofh/thermaldynamics/common.cfg +++ b/config/cofh/thermaldynamics/common.cfg @@ -1,5 +1,34 @@ # Configuration file +Attachment { + + Servo { + + Basic { + B:RedstoneControl=true + } + + Hardened { + B:RedstoneControl=true + } + + Reinforced { + B:RedstoneControl=true + } + + Signalum { + B:RedstoneControl=true + } + + Resonant { + B:RedstoneControl=true + } + + } + +} + + Duct { Energy { @@ -26,17 +55,16 @@ Duct { } -} - + Recipes { + B:UseFluidTransposer=true + B:UseHardenedGlass=true + } -Recipes { - B:UseFluidTransposer=true - B:UseHardenedGlass=true } Version { - S:Identifier=1.7.10R1.0.0RC3 + S:Identifier=1.7.10R1.0.0RC4 } diff --git a/config/cofh/thermalexpansion/client.cfg b/config/cofh/thermalexpansion/client.cfg index e96e8eb..b465bee 100644 --- a/config/cofh/thermalexpansion/client.cfg +++ b/config/cofh/thermalexpansion/client.cfg @@ -66,7 +66,7 @@ Machine { Version { - S:Identifier=1.7.10R4.0.0RC3 + S:Identifier=1.7.10R4.0.0RC4 } diff --git a/config/cofh/thermalexpansion/common.cfg b/config/cofh/thermalexpansion/common.cfg index b652b01..2971f19 100644 --- a/config/cofh/thermalexpansion/common.cfg +++ b/config/cofh/thermalexpansion/common.cfg @@ -610,7 +610,7 @@ Tank { Version { - S:Identifier=1.7.10R4.0.0RC3 + S:Identifier=1.7.10R4.0.0RC4 } diff --git a/config/iChunUtil.cfg b/config/iChunUtil.cfg index b978357..39d40f9 100644 --- a/config/iChunUtil.cfg +++ b/config/iChunUtil.cfg @@ -35,7 +35,7 @@ versioncheck { ########################################################################################################## versionsave { - I:dayCheck=4 + I:dayCheck=5 S:lastCheck= } diff --git a/mods/CoFHCore-[1.7.10]3.0.0RC3-203.jar b/mods/CoFHCore-[1.7.10]3.0.0RC4-204.jar similarity index 85% rename from mods/CoFHCore-[1.7.10]3.0.0RC3-203.jar rename to mods/CoFHCore-[1.7.10]3.0.0RC4-204.jar index 1f2697c..c461233 100644 Binary files a/mods/CoFHCore-[1.7.10]3.0.0RC3-203.jar and b/mods/CoFHCore-[1.7.10]3.0.0RC4-204.jar differ diff --git a/mods/ThermalDynamics-[1.7.10]1.0.0RC3-90.jar b/mods/ThermalDynamics-[1.7.10]1.0.0RC4-91.jar similarity index 80% rename from mods/ThermalDynamics-[1.7.10]1.0.0RC3-90.jar rename to mods/ThermalDynamics-[1.7.10]1.0.0RC4-91.jar index 3f17513..e902324 100644 Binary files a/mods/ThermalDynamics-[1.7.10]1.0.0RC3-90.jar and b/mods/ThermalDynamics-[1.7.10]1.0.0RC4-91.jar differ diff --git a/mods/ThermalExpansion-[1.7.10]4.0.0RC3-132.jar b/mods/ThermalExpansion-[1.7.10]4.0.0RC4-135.jar similarity index 92% rename from mods/ThermalExpansion-[1.7.10]4.0.0RC3-132.jar rename to mods/ThermalExpansion-[1.7.10]4.0.0RC4-135.jar index cd80401..261e734 100644 Binary files a/mods/ThermalExpansion-[1.7.10]4.0.0RC3-132.jar and b/mods/ThermalExpansion-[1.7.10]4.0.0RC4-135.jar differ