Skip to content

Commit

Permalink
Update again
Browse files Browse the repository at this point in the history
Adds RFTools and Dense Ores. A couple of updates as well.
  • Loading branch information
bs2609 committed Apr 29, 2015
1 parent 7a1f41c commit cb3c7e7
Show file tree
Hide file tree
Showing 23 changed files with 2,923 additions and 21 deletions.
86 changes: 86 additions & 0 deletions config/AppliedEnergistics2/Facades.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,18 @@ computercraft {
}


denseores {
B:block0=true
B:block0.1=true
B:block0.2=true
B:block0.3=true
B:block0.4=true
B:block0.5=true
B:block0.6=true
B:block0.7=true
}


enderio {
B:blockAlloySmelter=false
B:blockAttractor=false
Expand Down Expand Up @@ -987,6 +999,9 @@ extrautilities {
B:etherealglass=false
B:etherealglass.1=false
B:etherealglass.2=false
B:etherealglass.3=false
B:etherealglass.4=false
B:etherealglass.5=false
B:extractorbase=false
B:extractorbase.12=false
B:extractorbase.13=false
Expand Down Expand Up @@ -2211,6 +2226,7 @@ openblocks {
B:path=false
B:projector=false
B:ropeladder=false
B:scaffolding=false
B:sky=false
B:sponge=false
B:sprinkler=false
Expand Down Expand Up @@ -2521,6 +2537,76 @@ redstonearsenal {
}


rftools {
B:activityProbeBlock=true
B:biomeAbsorberBlock=false
B:counterBlock=false
B:crafterBlock1=false
B:crafterBlock2=false
B:crafterBlock3=false
B:creativeDimensionBuilderBlock=false
B:destinationAnalyzerBlock=true
B:dialingDeviceBlock=false
B:dimensionBuilderBlock=false
B:dimensionEditorBlock=false
B:dimensionEnscriberBlock=false
B:dimensionMonitorBlock=false
B:dimensionalBlankBlock=true
B:dimensionalBlock=true
B:dimensionalCross2Block=true
B:dimensionalCrossBlock=true
B:dimensionalPattern1Block=true
B:dimensionalPattern2Block=true
B:dimensionalShardBlock=true
B:dimensionalSmallBlocks=true
B:dimletFilterBlock=false
B:dimletResearcherBlock=false
B:dimletScramblerBlock=false
B:dimletWorkbenchBlock=false
B:enderMonitorBlock=false
B:endergenicBlock=false
B:energyExtractorBlock=false
B:environmentalControllerBlock=false
B:invisibleShieldBlock=false
B:itemFilterBlock=false
B:liquidAbsorberBlock=false
B:liquidMonitorBlock=false
B:machineBase=true
B:machineFrame=true
B:machineInfuserBlock=false
B:materialAbsorberBlock=false
B:matterBeamerBlock=false
B:matterBoosterBlock=true
B:matterReceiverBlock=false
B:matterTransmitterBlock=false
B:pearlInjectorBlock=false
B:proxyBlock=false
B:redstoneReceiverBlock=false
B:redstoneTransmitterBlock=false
B:relayBlock=false
B:rfMonitorBlock=false
B:screenBlock=false
B:screenControllerBlock=false
B:screenHitBlock=false
B:sequencerBlock=false
B:shieldBlock=false
B:shieldBlock2=false
B:shieldBlock3=false
B:shieldTemplateBlock=false
B:simpleDialerBlock=false
B:solidShieldBlock=false
B:spaceChamberBlock=false
B:spaceChamberControllerBlock=false
B:spaceProjectorBlock=false
B:spawnerBlock=false
B:storageScannerBlock=false
B:timeAbsorberBlock=false
B:timerBlock=false
B:volcanicBlock=false
B:volcanicCoreBlock=false
}


tconstruct {
B:ArmorDryingRack=false
B:BattleSignBlock=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=1429120081319
S:lastCheck=1430327608099
}


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)
#Wed Apr 15 18:48:35 BST 2015
#Wed Apr 29 18:36:09 BST 2015
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
Expand Down
26 changes: 25 additions & 1 deletion config/OpenBlocks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ blocks {
B:path=true
B:projector=true
B:ropeladder=true
B:scaffolding=true
B:sky=true
B:sponge=true
B:sprinkler=true
Expand Down Expand Up @@ -96,9 +97,11 @@ debug {


dropblock {
# Does the elevator drain player XP when used?
B:elevatorDrainsXP=true

# XP consumed by elevator (total amount = ratio * distance)
D:elevatorXpDrainRatio=0.0

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

Expand All @@ -120,6 +123,12 @@ dropblock {
}


egg {
# Can golden egg pick blocks while hatching (may lead to glitches)
B:pickBlocks=true
}


fan {
# Maximum force applied every tick to entities nearby (linear decay)
D:fanForce=0.05
Expand Down Expand Up @@ -254,6 +263,15 @@ loot {
}


magnet {
# Can crane magnet pick block?
B:pickBlocks=true

# Can crane magnet pick entities?
B:pickEntities=true
}


radio {
# Music merchant id (-1 to disable)
I:radioVillagerId=6156
Expand All @@ -263,6 +281,12 @@ radio {
}


scaffolding {
# The rate at which scaffolding should break. 0 - fastest
I:despawnRate=4
}


sponge {
# Sponge block range (distance from center)
I:spongeRange=3
Expand Down
10 changes: 5 additions & 5 deletions config/ThaumcraftMobAspects/MineFactoryReloaded.cfg
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.Needle",
"entityName": "MineFactoryReloaded.Item",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.mfrEntityPinkSlime",
"entityName": "MineFactoryReloaded.Needle",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.FishingRod",
"entityName": "MineFactoryReloaded.mfrEntityPinkSlime",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.SafariNet",
"entityName": "MineFactoryReloaded.FishingRod",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "MineFactoryReloaded.Item",
"entityName": "MineFactoryReloaded.SafariNet",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
Expand Down
7 changes: 7 additions & 0 deletions config/ThaumcraftMobAspects/OpenBlocks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "OpenBlocks.MountedBlock",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "OpenBlocks.MiniMe",
Expand Down
9 changes: 9 additions & 0 deletions config/ThaumcraftMobAspects/OpenMods.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{
"_HEADER": "*****************************************",
"entityName": "OpenMods.Block",
"_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.BottleTaint",
"entityName": "Thaumcraft.EldritchCrab",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_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": {}
Expand Down
16 changes: 8 additions & 8 deletions config/ThaumcraftMobAspects/TwilightForest.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -110,27 +110,27 @@
},
{
"_HEADER": "*****************************************",
"entityName": "TwilightForest.Hostile Wolf",
"entityName": "TwilightForest.tffallingice",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {
"bestia": 3,
"terra": 3
}
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "TwilightForest.tffallingice",
"entityName": "TwilightForest.Yeti",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
},
{
"_HEADER": "*****************************************",
"entityName": "TwilightForest.Yeti",
"entityName": "TwilightForest.Hostile Wolf",
"_FOOTER": "*****************************************",
"_COMMENT": "Aspects are in the form aspect : value ",
"aspects": {}
"aspects": {
"bestia": 3,
"terra": 3
}
},
{
"_HEADER": "*****************************************",
Expand Down
Loading

0 comments on commit cb3c7e7

Please sign in to comment.