Skip to content

Commit

Permalink
Updates for Forge and a bunch of mods
Browse files Browse the repository at this point in the history
  • Loading branch information
bs2609 committed May 16, 2016
1 parent ffc78d0 commit fd6114a
Show file tree
Hide file tree
Showing 69 changed files with 727 additions and 82 deletions.
Binary file modified bin/modpack.jar
Binary file not shown.
14 changes: 14 additions & 0 deletions config/AppliedEnergistics2/Facades.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2528,11 +2528,13 @@ openblocks {
B:bigbutton=false
B:blockPlacer=false
B:blockbreaker=false
B:builderguide=false
B:cannon=false
B:canvas=false
B:donationStation=false
B:drawingtable=false
B:elevator=true
B:elevatorrotating=false
B:fan=false
B:flag=false
B:goldenegg=false
Expand Down Expand Up @@ -3472,6 +3474,10 @@ thermaldynamics {
B:ThermalDynamics32.7=false
B:ThermalDynamics48=false
B:ThermalDynamics48.1=false
B:ThermalDynamics64=false
B:ThermalDynamics64.1=false
B:ThermalDynamics64.2=false
B:ThermalDynamics64.3=false
}


Expand Down Expand Up @@ -3508,6 +3514,9 @@ thermalexpansion {
B:Plate.1=false
B:Plate.2=false
B:Plate.3=false
B:Plate.4=false
B:Plate.5=false
B:Plate.6=false
B:Rockwool=true
B:Rockwool.1=true
B:Rockwool.10=true
Expand Down Expand Up @@ -3537,6 +3546,11 @@ thermalexpansion {
B:Tank.2=false
B:Tank.3=false
B:Tank.4=false
B:Workbench=false
B:Workbench.1=false
B:Workbench.2=false
B:Workbench.3=false
B:Workbench.4=false
}


Expand Down
6 changes: 6 additions & 0 deletions config/AppliedEnergistics2/extracells.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ integration {
# Enable IngameWikiMod Integration.
B:enableIngameWikiMod=true

# Enable Mekanism Integration.
B:enableMekanism=true

# Enable MekanismGas Integration.
B:enableMekanismGas=true

Expand All @@ -16,6 +19,9 @@ integration {
# Enable OpenComputers Integration.
B:enableOpenComputers=true

# Enable Thaumatic Energistics Integration.
B:"enableThaumatic Energistics"=true

# Enable Waila Integration.
B:enableWaila=true
}
Expand Down
3 changes: 3 additions & 0 deletions config/BiblioCraft.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ general {
# This will set the max number of uses an Enchanted Plate has before breaking. Default is 3.
I:MaxEnchantedPlateUses=3

# This will adjust the maximium render distance at which paintings can be seen. The default is 64.0 blocks.
D:PaintingRenderDistance=64.0

# Setting to true renders a shadow behind the text seen with the reading glasses. This can improve visability quite a bit, but sometimes doesn't render correctly. Try at your own discretion.
B:RenderTextShadow=false

Expand Down
13 changes: 13 additions & 0 deletions config/ForbiddenMagic.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ general {
# Disable if you don't like enchantments.
B:"Enchantments Enabled"=true

# List of OreDict names for garbage blocks, separated by semicolons, for the Consuming enchant to eat
S:"Garbage Blocks"=dirt;sand;gravel;cobblestone;netherrack

# Whether gluttony research is enabled. 0 = Enabled, 1 = Disabled, 2 = Hardcore
I:Gluttony=0
I:"Heretic Villager ID"=666
Expand Down Expand Up @@ -78,6 +81,16 @@ general {

potions {
I:"Blood Seal"=70
I:Dragonwrack=71
}


"power converters" {
# How much LP 0.01 Vis is worth
I:"LP to Vis"=5

# How much Mana 0.01 Vis is worth
I:"Mana to Vis"=8
}


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)
#Mon Oct 19 18:54:25 BST 2015
#Mon May 16 22:20:43 BST 2016
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
Expand Down
1 change: 1 addition & 0 deletions config/NEI/client.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ keys.gui.prev=201
keys.gui.recipe=19
keys.gui.search=33
keys.gui.usage=22
keys.gui.xu_ping=20
keys.showenchant=23
keys.world.chunkoverlay=67
keys.world.creative=0
Expand Down
35 changes: 33 additions & 2 deletions config/OpenBlocks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ blocks {
B:bigbutton=true
B:blockPlacer=true
B:blockbreaker=true
B:builder_guide=true
B:cannon=true
B:canvas=true
B:canvasglass=true
B:donationStation=true
B:drawingtable=true
B:elevator=true
B:elevator_rotating=true
B:fan=true
B:flag=true
B:goldenegg=true
Expand Down Expand Up @@ -57,6 +59,9 @@ cartographer {
S:blockBlacklist <
"Natura:Cloud"
>

# Should invalid height map request be always reported
B:reportInvalidRequest=false
}


Expand Down Expand Up @@ -96,7 +101,15 @@ debug {
}


devnull {
# If true, /dev/null will require sneaking in addition to clicking air to open gui
B:sneakClickToGui=true
}


dropblock {
# Should elevator move player to center of block after teleporting
B:centerOnBlock=false
B:elevatorDrainsXP=true

# XP consumed by elevator (total amount = ratio * distance)
Expand Down Expand Up @@ -156,8 +169,6 @@ features {

# Id of last stand enchantment
I:lastStandEnchantmentId=212

# 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
Expand Down Expand Up @@ -233,6 +244,7 @@ items {
B:cursor=true
B:devnull=true
B:emptyMap=true
B:epicEraser=true
B:filledbucket=true
B:goldenEye=true
B:hangglider=true
Expand All @@ -251,6 +263,13 @@ items {
B:stencil=true
B:tastyClay=true
B:technicolorGlasses=true
B:wrench=true
}


ladder {
# If true, ladders will behave in old way: single item will place ladder all the way down, but it will not drop when broken
B:infiniteMode=false
}


Expand Down Expand Up @@ -297,6 +316,9 @@ sponge {


sprinkler {
# Consume rate of bonemeal (ticks/item).
I:bonemealConsumeRate=600

# 1/chance that crops will be fertilized with bonemeal
I:bonemealFertilizeChance=200

Expand All @@ -305,6 +327,12 @@ sprinkler {

# 1/chance that crops will be fertilized without bonemeal
I:fertilizeChance=500

# Capacity (in mB) of internal tank.
I:internalTankCapacity=50

# Consume rate of sprinkler (ticks/mB).
I:waterConsumeRate=20
}


Expand Down Expand Up @@ -337,6 +365,9 @@ tomfoolery {
# Allow only flimflams that don't cause death (or at least very rarely)
B:safeOnly=false

# 0 - lore hidden, 1 - visible only with pressed ALT, 2 - always visible
I:sillyLoreDisplay=1

# Are you serious too?
B:weAreSeriousPeople=true
}
Expand Down
11 changes: 10 additions & 1 deletion config/OpenMods.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ debug {
# Control printing of stacktraces in case of unharvested drops
B:dropsDebug=false

# Maximum fake player pool that can doesn't produce warning
# Maximum fake player pool that doesn't produce warning
I:fakePlayerCountThreshold=10

# Maximum allowed size of tessellator pool
I:tessellatorPoolLimit=20
}


feature {
# Enables command line calculator
B:calculatorCommands=true
}


12 changes: 12 additions & 0 deletions config/OpenPeripheral.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,20 @@ blocks {


glasses {
# Default time (in ticks) between two drag events
I:defaultDragPeriod=10

# Default difference in mouse position (in pixels) needed before drag event is sent to server
I:defaultDragThreshold=5

# Should glasses listen to all chat (not just prefixed with $$)
B:listenToAllChat=true

# Minimal time (in ticks) between two drag events
I:minimalDragPeriod=10

# Minimal difference in mouse position (in pixels) needed before drag event is sent to server
I:minimalDragThreshold=5
}


Expand Down
6 changes: 6 additions & 0 deletions config/OpenPeripheralCore.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ integration {
}


performance {
# Number of threads available to calls marked with @ReturnSignal
I:threadPoolForSignallingCalls=10
}


Loading

0 comments on commit fd6114a

Please sign in to comment.