Skip to content
This repository has been archived by the owner on Oct 13, 2021. It is now read-only.

Commit

Permalink
Merge pull request #26 from Nincraft/Dev
Browse files Browse the repository at this point in the history
Dev to master
  • Loading branch information
Nincodedo committed May 16, 2014
2 parents 39be184 + 25d783a commit a9fd96d
Show file tree
Hide file tree
Showing 16 changed files with 1,134 additions and 58 deletions.
42 changes: 42 additions & 0 deletions Configs Added by Nincraft/OpenEye.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"gui": {
"mainScreenExtraLine": {
"comment": "Enables extra line in main menu screen under buttons (if true, only note button will be displayed)",
"value": true
},
"mainScreenNotes": {
"comment": "Enables OpenEye additions to main menu screen",
"value": true
}
},
"features": {
"responseBlacklist": {
"value": []
},
"reportsBlacklist": {
"value": []
},
"haltOnDangerousFiles": {
"value": false
}
},
"data": {
"scanOnly": {
"value": false
},
"tags": {
"value": []
}
},
"debug": {
"pingOnInitialReport": {
"value": false
},
"crashOnStartup": {
"value": false
},
"dontSend": {
"value": false
}
}
}
33 changes: 33 additions & 0 deletions Configs Added by Nincraft/books/enchiridion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Configuration file

####################
# item
####################

item {
I:"Enchiridion Items"=28999
}


####################
# settings
####################

settings {
# This is a list of words that are considered books, and can be put in to book binders, if they are found in the unlocalized name of an item.
S:"Book Strings" <
guide
manual
pedia
lexicon
thaumonomicon
mudora
book
routing.table
compendium
>
B:"Debug Mode Enabled"=false
B:"Print Item Codes to the Console"=false
}


15 changes: 9 additions & 6 deletions ModVersions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,20 @@ Botania beta16
BspkrsCore v5.3
BuildCraft v4.2.2
BuildCraft Colour Router Addon v0.3.4
Calclavia Core v1.2.0.312
Calclavia Core v1.2.0.330
Carpenter's Blocks v2.0.8
Chisel v1.5.2
Code Chicken Core v0.9.0.9
Code Chicken Lib v1.0.0.62
COFH Core v2.0.0.2
COFH Core v2.0.0.5
ComputerCraft v1.58
Damage Indicators v2.9.2.3
DartCraft v0.2.18
DenLib v3.2.6
Dimensional Anchors v57.1.96
ElectroMagicTools v1.0.9e
Emashers Resource v1.2.3.4 (lol)
Enchiridion-1.6.4 v1.1
EnderIO v1.0.1.353
Ender Prospecting v1.0.1.6
Ender Storage v1.4.3.6
Expand All @@ -53,6 +54,7 @@ Galacticraft Planets v2.0.12.1010
Gendustry v1.0.3.41
Gravisuite v1.9.9a
GregTech v4.07o
Hats v2.1.6
Hardcore Ender Expansion v1.5
iChunUtil v2.4.0
IC2 Nuclear Control v1.6.2e
Expand Down Expand Up @@ -92,6 +94,7 @@ Not Enough Keys v0.0.4
Numina v0.1.2-55
Obsidian Pressure Plates v2.0.0.15
OpenBlocks v1.2.7
OpenEye v0.4
OpenModsLib v0.4b
OpenPeripheralAddons v0.1.3
OpenPeripheralCore v0.3.3
Expand All @@ -107,8 +110,9 @@ RcDusts v0.0.6d
Redstone Arsenal v1.0.0.0
Reliquary v1.1Custom
RemoteIO v1.11
Resonant Induction (Core, Archaic, Electrical, Mechanical) 0.3.1.352
ServerTools v1.6.4-23
SimplyJetpacks v0.1.3
SimplyJetpacks v0.1.4.1
SlickUtil
SortFix v1.0
Steve's Carts 2.0.0b10
Expand All @@ -117,15 +121,14 @@ Thaumcraft v4.1.0g
Thaumic Reliquary v1.1.1.TPPI
Thaumic Tinkerer v2.3-137
Thaumic Tinkerer KAMI vJ6
Thermal Expansion v3.0.0.2
Thermal Expansion v3.0.0.7
Tinker's Construct v1.5.5.4
Tinker's Mechworks v1.6.4-19
Tinker's Steelworks v0.0.3.1
TPPITweaks v1.1.0-44
TPPITweaks v1.1.0-45
Translocators v1.1.0.15
Twilight Forest v1.20.3
Universal Electricity Core v3.1.0.74
Universal Electricity Core v3.1.0.91
Waila v1.5.1a
Wireless Redstone - CBE v1.4.0.7
Witchery v0-16-3_164
Expand Down
2 changes: 1 addition & 1 deletion config/AM2/AM2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ general {
B:WitchwoodLeafParticles=true

# Comma-separated list of block IDs that dig cannot break. If a block is flagged as unbreackable in code, Dig will already be unable to break it. There is no need to set it here (eg, bedrock, etc.). Dig also makes use of Forge block harvest checks. This is mainly for fine-tuning.
S:dig_blacklist=851,852,2271,2412,2440,2444,2445,2446,2447,2448,2453,2527,3144,3464,3468,3474,3475,3484,3485,4327,6027,7130,7131,7132,7133,7134,7135,7137,7138,7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7157,7158,7159,7160,7161,7162,7163,7164,10456,10457,10459,10460,10556,10557,10558,10559,10560,10561,10656,10657,10658,19416,19417,19418,19419,19420,19421,19422,19423,19424,19425,19426,19427,19436,19437,19438,19439,19440,19443,19456,19457,19458,19459,19460,19461,19464,19476,19477,19478,19479,19480,25298,25304,30184
S:dig_blacklist=397,851,852,2271,2412,2440,2444,2445,2446,2447,2448,2453,2527,3144,3464,3468,3474,3475,3484,3485,4327,6027,7130,7131,7132,7133,7134,7135,7137,7138,7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7157,7158,7159,7160,7161,7162,7163,7164,10456,10457,10459,10460,10556,10557,10558,10559,10560,10561,10656,10657,10658,19416,19417,19418,19419,19420,19421,19422,19423,19424,19425,19426,19427,19436,19437,19438,19439,19440,19443,19456,19457,19458,19459,19460,19461,19464,19476,19477,19478,19479,19480,25298,25304,30184
I:mage_villager_profession_id=29

# Comma-separated list of dimension IDs that AM should *not* do worldgen in.
Expand Down
Loading

0 comments on commit a9fd96d

Please sign in to comment.