Skip to content

Commit

Permalink
Another update
Browse files Browse the repository at this point in the history
Update some RF mods again to keep up
  • Loading branch information
bs2609 committed Feb 24, 2015
1 parent 6b49896 commit 3153be8
Show file tree
Hide file tree
Showing 40 changed files with 1,320 additions and 1,420 deletions.
10 changes: 10 additions & 0 deletions config/AppliedEnergistics2/Facades.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,12 @@ forbiddenmagic {
B:ArcaneCake=false
B:InkFlower=false
B:StarBlock=true
B:TaintBlock=true
B:TaintBlock.1=true
B:TaintLeaves=false
B:TaintLog=true
B:TaintPlank=true
B:TaintSapling=false
B:UmbralBush=false
B:WrathCage=false
}
Expand Down Expand Up @@ -1865,6 +1871,7 @@ minefactoryreloaded {
B:conveyor=false
B:detcord=false
B:farmland=false
B:farmland.3=false
B:machine0=false
B:machine1=false
B:machine2=false
Expand Down Expand Up @@ -2964,6 +2971,9 @@ thermalexpansion {
B:Device=false
B:Frame=false
B:Frame.1=false
B:Frame.10=false
B:Frame.11=false
B:Frame.12=false
B:Frame.2=false
B:Frame.3=false
B:Frame.4=false
Expand Down
10 changes: 10 additions & 0 deletions config/ForbiddenMagic.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ compatibility {
B:"Special Mobs Interaction"=true
B:"Thaumic Tinkerer Interaction"=true
B:"Tinkers Construct Interaction"=true
B:"Twilight Forest Interaction"=true
}


Expand All @@ -29,13 +30,22 @@ enchantments {
}


"focus upgrades" {
I:Hellfire=42
I:Pandemonium=43
}


general {
# Disable to remove the recipe and effects of the Capitalist enchantment.
B:"Capitalist Enchantment"=true

# Disable to remove the Emerald Transmutation research and recipe.
B:"Emerald Transmutation"=true

# Whether gluttony research is enabled. 0 = Enabled, 1 = Disabled, 2 = Hardcore
I:Gluttony=0

# Enable to remove Luxuria aspect and related items.
B:"No Lust"=false

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)
#Sun Feb 22 04:53:50 GMT 2015
#Tue Feb 24 10:18:33 GMT 2015
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
Expand Down
7 changes: 7 additions & 0 deletions config/ThaumcraftMobAspects/MineFactoryReloaded.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,12 @@
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.DebugTracker",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
}
]
6 changes: 3 additions & 3 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.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": {}
Expand Down
14 changes: 7 additions & 7 deletions config/ThaumcraftMobAspects/TwilightForest.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,6 @@
"terra": 7
}
},
{
"_HEADER": "*****************************************",
"entityName": "TwilightForest.tffallingice",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "TwilightForest.Yeti",
Expand All @@ -132,6 +125,13 @@
"terra": 3
}
},
{
"_HEADER": "*****************************************",
"entityName": "TwilightForest.tffallingice",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "TwilightForest.Twilight Wraith",
Expand Down
18 changes: 17 additions & 1 deletion config/UniqueNames.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# generated by bspkrsCore 20150222 04:53:52
# generated by bspkrsCore 20150224 10:18:36

**********************************************
* #### # ### ### # # #### *
Expand Down Expand Up @@ -212,6 +212,11 @@ ExtraUtilities:trashcan
ForbiddenMagic:ArcaneCake
ForbiddenMagic:InkFlower
ForbiddenMagic:StarBlock
ForbiddenMagic:TaintBlock
ForbiddenMagic:TaintLeaves
ForbiddenMagic:TaintLog
ForbiddenMagic:TaintPlank
ForbiddenMagic:TaintSapling
ForbiddenMagic:UmbralBush
ForbiddenMagic:WrathCage
ForgeMultipart:block
Expand Down Expand Up @@ -1590,6 +1595,7 @@ ExtraUtilities:unstableingot
ExtraUtilities:watering_can
ForbiddenMagic:ArcaneCake
ForbiddenMagic:ArcaneCakeItem
ForbiddenMagic:BlinkFocus
ForbiddenMagic:Crystalwell
ForbiddenMagic:DiabolistFork
ForbiddenMagic:FMResource
Expand All @@ -1601,11 +1607,20 @@ ForbiddenMagic:MorphPickaxe
ForbiddenMagic:MorphShovel
ForbiddenMagic:MorphSword
ForbiddenMagic:NetherShard
ForbiddenMagic:Primewell
ForbiddenMagic:RidingCrop
ForbiddenMagic:RingNutrition
ForbiddenMagic:SkullAxe
ForbiddenMagic:StarBlock
ForbiddenMagic:SubCollar
ForbiddenMagic:TaintBlock
ForbiddenMagic:TaintCoal
ForbiddenMagic:TaintFruit
ForbiddenMagic:TaintLeaves
ForbiddenMagic:TaintLog
ForbiddenMagic:TaintPickaxe
ForbiddenMagic:TaintPlank
ForbiddenMagic:TaintSapling
ForbiddenMagic:TaintShovel
ForbiddenMagic:UmbralBush
ForbiddenMagic:WandCaps
Expand Down Expand Up @@ -1828,6 +1843,7 @@ MineFactoryReloaded:rubberwood.log
MineFactoryReloaded:rubberwood.sapling
MineFactoryReloaded:ruler
MineFactoryReloaded:safarinet.jailer
MineFactoryReloaded:safarinet.jailer.fancy
MineFactoryReloaded:safarinet.launcher
MineFactoryReloaded:safarinet.reusable
MineFactoryReloaded:safarinet.singleuse
Expand Down
92 changes: 0 additions & 92 deletions config/cofh/Client.cfg

This file was deleted.

70 changes: 0 additions & 70 deletions config/cofh/CoFHCore.cfg

This file was deleted.

37 changes: 0 additions & 37 deletions config/cofh/CoFHLoot.cfg

This file was deleted.

Empty file removed config/cofh/CoFHSocial-Friends.cfg
Empty file.
Loading

0 comments on commit 3153be8

Please sign in to comment.