Skip to content

Commit

Permalink
Small update
Browse files Browse the repository at this point in the history
Updates for ThermalEtc and a couple of other things. More microblocks.
  • Loading branch information
bs2609 committed Mar 4, 2015
1 parent 3153be8 commit c47f961
Show file tree
Hide file tree
Showing 34 changed files with 201 additions and 144 deletions.
5 changes: 5 additions & 0 deletions config/AppliedEnergistics2/Facades.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,11 @@ highlands {
}


immibismicroblocks {
B:MicroblockContainer=false
}


ironchest {
B:BlockIronChest=false
B:BlockIronChest.1=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)
#Tue Feb 24 10:18:33 GMT 2015
#Wed Mar 04 16:14:15 GMT 2015
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
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.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": {}
Expand Down
4 changes: 2 additions & 2 deletions config/ThaumcraftMobAspects/MineFactoryReloaded.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,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": {}
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.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": {}
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.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": {}
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.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": {}
Expand Down Expand Up @@ -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": {}
Expand All @@ -190,7 +190,7 @@
},
{
"_HEADER": "*****************************************",
"entityName": "Railcraft.ItemFireproof",
"entityName": "Railcraft.railcraft.cart.tnt.wood",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand Down Expand Up @@ -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": {}
Expand All @@ -260,7 +260,7 @@
},
{
"_HEADER": "*****************************************",
"entityName": "Railcraft.railcraft.cart.bore",
"entityName": "Railcraft.cart.bore",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand All @@ -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": {}
Expand All @@ -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": {}
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.EdibleSlime",
"entityName": "TConstruct.KingSlime",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand All @@ -78,7 +78,7 @@
},
{
"_HEADER": "*****************************************",
"entityName": "TConstruct.KingSlime",
"entityName": "TConstruct.EdibleSlime",
"_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.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": {}
Expand Down Expand Up @@ -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": {}
Expand Down
Loading

0 comments on commit c47f961

Please sign in to comment.