Skip to content

Commit

Permalink
Yet another update
Browse files Browse the repository at this point in the history
Update CoFH mods to release versions. Updates for some other mods as
well.
  • Loading branch information
bs2609 committed Apr 15, 2015
1 parent e704d81 commit 7a1f41c
Show file tree
Hide file tree
Showing 55 changed files with 425 additions and 243 deletions.
5 changes: 5 additions & 0 deletions config/AppliedEnergistics2/Facades.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -939,11 +939,14 @@ extrautilities {
B:cursedearthside=false
B:curtains=false
B:darkportal=false
B:darkportal.2=false
B:decorativeBlock1=true
B:decorativeBlock1.1=true
B:decorativeBlock1.10=true
B:decorativeBlock1.11=true
B:decorativeBlock1.12=true
B:decorativeBlock1.13=true
B:decorativeBlock1.14=true
B:decorativeBlock1.2=true
B:decorativeBlock1.3=true
B:decorativeBlock1.4=true
Expand All @@ -955,6 +958,7 @@ extrautilities {
B:decorativeBlock2=false
B:decorativeBlock2.1=false
B:decorativeBlock2.10=false
B:decorativeBlock2.11=false
B:decorativeBlock2.2=false
B:decorativeBlock2.3=false
B:decorativeBlock2.4=false
Expand Down Expand Up @@ -3026,6 +3030,7 @@ thermalexpansion {
B:Frame.8=false
B:Frame.9=false
B:Glass=false
B:Glass.1=false
B:Light=false
B:Light.1=false
B:Light.2=false
Expand Down
2 changes: 1 addition & 1 deletion config/AppliedEnergistics2/VersionChecker.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
cache {
# Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
I:interval=24
S:lastCheck=1428612278666
S:lastCheck=1429120081319
}


Expand Down
2 changes: 2 additions & 0 deletions config/ExtraUtilities.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ options {
B:disableMultiBlocksCreativeTab=false
B:disableTransferNodeParticles=false
B:disableWitherNoisesIfNotNearby=true
I:lastMilleniumDimensionID=-112
B:peacefulTableInAllDifficulties=false
B:soulDrainResetsOnDeath=false
B:unstableIngotsExplode=true
}
Expand Down
2 changes: 1 addition & 1 deletion config/InvTweaks.cfg
Original file line number Diff line number Diff line change
@@ -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)
#Thu Apr 09 21:45:05 BST 2015
#Wed Apr 15 18:48:35 BST 2015
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
Expand Down
8 changes: 7 additions & 1 deletion config/OpenBlocks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,16 @@ dropblock {
# Does the elevator drain player XP when used?
B:elevatorDrainsXP=true

# Disable limit of blocks between elevators (equivalent to maxPassThrough = infinity)
B:ignoreAllBlocks=false

# The elevator will ignore half blocks when counting the blocks it can pass through
B:ignoreHalfBlocks=false

# The elevator will try to pass through blocks that have custom collision boxes
B:irregularBlocksArePassable=true

# The maximum amount of blocks the elevator can pass through before the teleport fails. -1 disables this
# The maximum amount of blocks the elevator can pass through before the teleport fails
I:maxPassThrough=4

# The range of the drop block
Expand Down Expand Up @@ -147,6 +150,9 @@ features {

# Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds
S:xpFluidId=xpjuice

# Storage in mB needed to store single XP point
I:xpToLiquidRatio=20
}


Expand Down
4 changes: 2 additions & 2 deletions config/ThaumcraftMobAspects/Mekanism.cfg
Original file line number Diff line number Diff line change
@@ -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": {}
Expand Down
11 changes: 9 additions & 2 deletions config/ThaumcraftMobAspects/MineFactoryReloaded.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,21 @@
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.Rocket",
"entityName": "MineFactoryReloaded.SafariNet",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.SafariNet",
"entityName": "MineFactoryReloaded.Item",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.Rocket",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand Down
4 changes: 2 additions & 2 deletions config/ThaumcraftMobAspects/Natura.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
Expand Down
8 changes: 4 additions & 4 deletions config/ThaumcraftMobAspects/OpenBlocks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
Expand Down
36 changes: 18 additions & 18 deletions config/ThaumcraftMobAspects/Railcraft.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
Expand Down Expand Up @@ -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": {}
Expand All @@ -190,7 +190,7 @@
},
{
"_HEADER": "*****************************************",
"entityName": "Railcraft.railcraft.cart.tnt.wood",
"entityName": "Railcraft.ItemFireproof",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand Down Expand Up @@ -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": {}
Expand All @@ -260,7 +260,7 @@
},
{
"_HEADER": "*****************************************",
"entityName": "Railcraft.cart.bore",
"entityName": "Railcraft.railcraft.cart.bore",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand All @@ -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": {}
Expand All @@ -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": {}
Expand Down
4 changes: 2 additions & 2 deletions config/ThaumcraftMobAspects/TConstruct.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
{
"_HEADER": "*****************************************",
"entityName": "TConstruct.KingSlime",
"entityName": "TConstruct.EdibleSlime",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand All @@ -78,7 +78,7 @@
},
{
"_HEADER": "*****************************************",
"entityName": "TConstruct.EdibleSlime",
"entityName": "TConstruct.KingSlime",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand Down
10 changes: 5 additions & 5 deletions config/ThaumcraftMobAspects/Thaumcraft.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
Expand Down Expand Up @@ -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": {}
Expand Down
Loading

0 comments on commit 7a1f41c

Please sign in to comment.