API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 7th, 2013
213
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 63.12 KB | None | 0 0
raw download clone embed print report
  1. Only in Direwolf20_1_5-server-newbeta/config: AdvancedPowerManagement.cfg
  2. Only in Direwolf20_1_5-server-newbeta/config: AdvancedSolarPanel.cfg
  3. diff -ur Direwolf20_1_5-server-1_1_2/config/AppliedEnergistics.cfg Direwolf20_1_5-server-newbeta/config/AppliedEnergistics.cfg
  4. --- Direwolf20_1_5-server-1_1_2/config/AppliedEnergistics.cfg 2013-08-03 13:01:20.000000000 -0500
  5. +++ Direwolf20_1_5-server-newbeta/config/AppliedEnergistics.cfg 2013-08-05 20:39:40.000000000 -0500
  6. @@ -9,13 +9,14 @@
  7. # options
  8. #===================
  9. # Options for Applied Energistics as a whole.
  10. - # oreDepthModifier - This feature is deprecated, and will be removed in a future revision.
  11. ####################
  12.  
  13. options {
  14. - B:enableVersionChecker=true
  15. + B:enableVersionChecker=false
  16. B:enableWorldGenQuartz=true
  17. - I:ore.additionalOresPerCluster=0
  18. + I:ore.additionalOresPerCluster=1
  19. + I:ore.densityModifier=1
  20. + I:ore.depthModifier=0
  21. }
  22.  
  23. ####################
  24. @@ -23,7 +24,7 @@
  25. ####################
  26.  
  27. vesionchecker {
  28. - S:lastStarted=hjw9l9rq
  29. + S:lastStarted=hjzkue9p
  30. }
  31.  
  32. ####################
  33. @@ -31,7 +32,7 @@
  34. ####################
  35.  
  36. bcintegration {
  37. - B:enableBCtoMEChipRecipe=false
  38. + B:enableBCtoMEChipRecipe=true
  39. B:useBuildcraftChips=false
  40. }
  41.  
  42. @@ -57,14 +58,16 @@
  43. ####################
  44. # block
  45. #===================
  46. -# BlockID's for blocks added by Applied Energistics ( these are not shifted. +256 for Ingame ).
  47. +# BlockID's for blocks added by Applied Energistics ( these are not shifted. +256 for Ingame )
  48. +# TinyTNT - set to -1 to disable ( you can turn off block damage for this item using enableTinyTNTBlockDamage )
  49. ####################
  50.  
  51. block {
  52. + I:appeng.TinyTNT=899
  53. I:appeng.blockMulti=900
  54. - I:appeng.blockMulti2=4090
  55. - I:appeng.blockMulti3=4089
  56. - I:appeng.blockWorld=4088
  57. + I:appeng.blockMulti2=901
  58. + I:appeng.blockMulti3=903
  59. + I:appeng.blockWorld=902
  60. }
  61.  
  62.  
  63. @@ -75,13 +78,25 @@
  64. ####################
  65.  
  66. features {
  67. + B:enableCrafting=true
  68. + B:enableCraftingTerm=true
  69. B:enableEntropyAcc=true
  70. + B:enableExportBus=true
  71. B:enableGrinder=true
  72. + B:enableImportBus=true
  73. + B:enableLevelEmiter=true
  74. + B:enableMAC=true
  75. B:enableMassCannon=true
  76. B:enableMassCannonBlockDamage=true
  77. + B:enableQNB=true
  78. B:enableQuartzTools=true
  79. B:enableSpaceClickMoving=true
  80. + B:enableStorageBus=true
  81. + B:enableStorageMonitor=true
  82. + B:enableTPlane=true
  83. + B:enableTinyTNTBlockDamage=true
  84. B:enableVibrationCata=true
  85. + B:enableWirelessAccess=true
  86. }
  87.  
  88.  
  89. @@ -122,6 +137,14 @@
  90. Platinum
  91. Nickel
  92. >
  93. + S:ores <
  94. + Copper
  95. + Tin
  96. + Silver
  97. + Lead
  98. + Bronze
  99. + Brass
  100. + >
  101. }
  102.  
  103.  
  104. @@ -157,6 +180,7 @@
  105. logging {
  106. B:enableLogging=false
  107. B:logBlockUpdates=false
  108. + B:logConcurrentModificationExceptions=false
  109. B:logCrafting=false
  110. B:logGrinderOres=false
  111. B:logIntegration=false
  112. @@ -175,16 +199,16 @@
  113. # options
  114. #===================
  115. # Options for Mass Energy Components.
  116. - # largeDrives - This feature is deprecated, and will be removed in a future revision.
  117. ####################
  118.  
  119. options {
  120. I:automationMinTickRate=5
  121. - D:base.wireless.range=32.0
  122. + D:base.wireless.range=16.0
  123. I:craftingMinTickRate=0
  124. B:enableShiftInCondenser=false
  125. - I:max.wireless.extenderBonus=2
  126. + I:max.wireless.extenderBonus=1
  127. I:max.wireless.extenders=16
  128. + D:perTickNetworkBridge=200.0
  129. D:powerUsageMultiplier=1.0
  130. D:powerWirelessDistanceMultiplier=10.0
  131. B:requirePower=true
  132. @@ -201,15 +225,6 @@
  133. }
  134.  
  135. ####################
  136. - # condenser
  137. - ####################
  138. -
  139. - condenser {
  140. - I:MatterBalls=256
  141. - I:Singularies=256000
  142. - }
  143. -
  144. - ####################
  145. # power
  146. ####################
  147.  
  148. @@ -220,6 +235,15 @@
  149. D:tier4Power=2.0
  150. }
  151.  
  152. + ####################
  153. + # condenser
  154. + ####################
  155. +
  156. + condenser {
  157. + I:MatterBalls=256
  158. + I:Singularies=256000
  159. + }
  160. +
  161. }
  162.  
  163.  
  164. diff -ur Direwolf20_1_5-server-1_1_2/config/BiblioCraft.cfg Direwolf20_1_5-server-newbeta/config/BiblioCraft.cfg
  165. --- Direwolf20_1_5-server-1_1_2/config/BiblioCraft.cfg 2013-08-03 13:01:04.000000000 -0500
  166. +++ Direwolf20_1_5-server-newbeta/config/BiblioCraft.cfg 2013-08-05 20:39:22.000000000 -0500
  167. @@ -36,10 +36,10 @@
  168.  
  169. general {
  170. # These are keywords that add additional support for more types of potions and items. Add more keyworks if you wish to allow more types of items to be displayed.
  171. - S:AdditionalPotions=essence, mead, bottle, test, element, molecule, can, capsule, cell, catalyst, ambrosia, honey pot, dissipation, vial, juice
  172. + S:AdditionalPotions=essence, mead, bottle, test, element, molecule, can, capsule, cell, catalyst, ambrosia, honey pot, dissipation, vial, juice, serum
  173.  
  174. # These are the names of additional tools that can be added to the Tool Rack. Added keywords will allow additional items to be placed on this block.
  175. - S:AdditionalTools=sprayer, wand, rod, scepter, wrench, screwdriver, meter, handsaw, gun, cutter, scoop, soldering, painter, reader, shovel, grafter, pickaxe, pipette, magnifying, sword, axe, hammer
  176. + S:AdditionalTools=sprayer, wand, rod, scepter, wrench, screwdriver, meter, handsaw, gun, cutter, scoop, soldering, painter, reader, shovel, grafter, pickaxe, pipette, magnifying, sword, pan, axe, rapier, mattock
  177.  
  178. # Should blank books be allowed on Bookcases? (true or false)
  179. B:AllowEmptyBooks=false
  180. Only in Direwolf20_1_5-server-newbeta/config: CCM-Modding
  181. diff -ur Direwolf20_1_5-server-1_1_2/config/ChargePads.cfg Direwolf20_1_5-server-newbeta/config/ChargePads.cfg
  182. --- Direwolf20_1_5-server-1_1_2/config/ChargePads.cfg 2013-07-30 19:06:20.000000000 -0500
  183. +++ Direwolf20_1_5-server-newbeta/config/ChargePads.cfg 2013-08-01 04:51:08.000000000 -0500
  184. @@ -41,13 +41,13 @@
  185.  
  186. item {
  187. # Upgrades: Basic Modules ItemID
  188. - I:upgradeBasicModules=31742
  189. + I:upgradeBasicModules=22742
  190.  
  191. # Upgrades: Emitter Conversion Modules ItemID
  192. - I:upgradeEmitterModules=31741
  193. + I:upgradeEmitterModules=22741
  194.  
  195. # Upgrade Kit ItemID
  196. - I:upgradeKits=31743
  197. + I:upgradeKits=22743
  198. }
  199.  
  200.  
  201. diff -ur Direwolf20_1_5-server-1_1_2/config/CodeChickenCore.cfg Direwolf20_1_5-server-newbeta/config/CodeChickenCore.cfg
  202. --- Direwolf20_1_5-server-1_1_2/config/CodeChickenCore.cfg 2013-08-03 13:01:02.000000000 -0500
  203. +++ Direwolf20_1_5-server-newbeta/config/CodeChickenCore.cfg 2013-08-05 20:39:20.000000000 -0500
  204. @@ -11,7 +11,7 @@
  205. #If set to true, creepers will not destroy landscape. (A version of mobGreifing setting just for creepers)
  206. environmentallyFriendlyCreepers=false
  207. #Set to false to make lava fade away like water if all the source blocks are destroyed
  208. - persistantLava=true
  209. + persistantLava=false
  210. #Set this to true to use the pre1.5 lava textures
  211. replaceLavaFX=false
  212. #Set this to true to use the pre1.5 water textures
  213. Only in Direwolf20_1_5-server-newbeta/config: DIAdvancedCompatibility
  214. Only in Direwolf20_1_5-server-newbeta/config: DamageIndicatorsMod.cfg
  215. Only in Direwolf20_1_5-server-newbeta/config: DimDoors.cfg
  216. Only in Direwolf20_1_5-server-newbeta/config: DimDoors_Custom_schematics
  217. diff -ur Direwolf20_1_5-server-1_1_2/config/EE3/EE3.cfg Direwolf20_1_5-server-newbeta/config/EE3/EE3.cfg
  218. --- Direwolf20_1_5-server-1_1_2/config/EE3/EE3.cfg 2013-08-03 13:01:08.000000000 -0500
  219. +++ Direwolf20_1_5-server-newbeta/config/EE3/EE3.cfg 2013-08-05 20:39:28.000000000 -0500
  220. @@ -75,6 +75,7 @@
  221. item {
  222. I:alchemicalBag=27005
  223. I:alchemicalDust=27004
  224. + I:dustAlchemical=27004
  225. I:shardMinium=27000
  226. I:stoneInert=27001
  227. I:stoneMinium=27002
  228. diff -ur Direwolf20_1_5-server-1_1_2/config/EnderStorage.cfg Direwolf20_1_5-server-newbeta/config/EnderStorage.cfg
  229. --- Direwolf20_1_5-server-1_1_2/config/EnderStorage.cfg 2013-08-03 13:01:20.000000000 -0500
  230. +++ Direwolf20_1_5-server-newbeta/config/EnderStorage.cfg 2013-08-05 20:39:40.000000000 -0500
  231. @@ -2,7 +2,7 @@
  232. #Deleting any element will restore it to it's default value
  233. #Block ID's will be automatically generated the first time it's run
  234.  
  235. -block.id=254
  236. +block.id=252
  237.  
  238. #Set to true to make the vanilla enderchest unplaceable.
  239. disable-vanilla=false
  240. Only in Direwolf20_1_5-server-newbeta/config: GraviSuite.cfg
  241. Only in Direwolf20_1_5-server-newbeta/config: GregTech
  242. Only in Direwolf20_1_5-server-newbeta/config: IC2NuclearControl.cfg
  243. Only in Direwolf20_1_5-server-newbeta/config: IC2NuclearControl.lang
  244. diff -ur Direwolf20_1_5-server-1_1_2/config/InvTweaks.cfg Direwolf20_1_5-server-newbeta/config/InvTweaks.cfg
  245. --- Direwolf20_1_5-server-1_1_2/config/InvTweaks.cfg 2013-08-03 13:01:20.000000000 -0500
  246. +++ Direwolf20_1_5-server-newbeta/config/InvTweaks.cfg 2013-08-05 20:39:42.000000000 -0500
  247. @@ -1,6 +1,6 @@
  248. #Inventory Tweaks Configuration
  249. #(Regarding shortcuts, all key names can be found at: http://www.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
  250. -#Sat Aug 03 13:01:21 CST 2013
  251. +#Mon Aug 05 20:39:42 CST 2013
  252. enableMiddleClick=true
  253. showChestButtons=true
  254. enableSortingOnPickup=false
  255. @@ -19,4 +19,4 @@
  256. shortcutKeyToUpperSection=UP
  257. shortcutKeyToLowerSection=DOWN
  258. shortcutKeyDrop=LALT, RALT
  259. -version=1.54b
  260. +version=1.55-dev
  261. diff -ur Direwolf20_1_5-server-1_1_2/config/MiscPeripherals.cfg Direwolf20_1_5-server-newbeta/config/MiscPeripherals.cfg
  262. --- Direwolf20_1_5-server-1_1_2/config/MiscPeripherals.cfg 2013-08-03 13:01:26.000000000 -0500
  263. +++ Direwolf20_1_5-server-newbeta/config/MiscPeripherals.cfg 2013-08-05 20:39:48.000000000 -0500
  264. @@ -45,6 +45,7 @@
  265. features {
  266. # Enable the Hardware Accelerator peripheral
  267. B:enableAccelerator=true
  268. + B:enableAdvancedSolar=true
  269.  
  270. # Enable the Alchemist turtle upgrade
  271. B:enableAlchemist=true
  272. @@ -105,6 +106,7 @@
  273.  
  274. # Enable the HV Solar turtle upgrade
  275. B:enableHVSolar=true
  276. + B:enableHybridSolar=true
  277.  
  278. # Enable the Interactive Sorter peripheral
  279. B:enableInteractiveSorter=true
  280. @@ -129,6 +131,8 @@
  281.  
  282. # Enable the Iron Note Block peripheral and turtle upgrade
  283. B:enableNote=true
  284. + B:enableNuclearReader=true
  285. + B:enableNuclearReaderT2=true
  286.  
  287. # Enable the Ore Scanner turtle upgrade
  288. B:enableODScanner=true
  289. @@ -192,6 +196,7 @@
  290.  
  291. # Enable the Treetap turtle upgrade
  292. B:enableTreetap=true
  293. + B:enableUltimateHybridSolar=true
  294.  
  295. # Enable the Wand turtle upgrade
  296. B:enableWand=true
  297. @@ -247,13 +252,13 @@
  298. I:alpha=26454
  299.  
  300. # ID for the Computer Engineer's Backpack
  301. - I:backpack=26455
  302. + I:backpack=31743
  303.  
  304. # ID for the Woven Computer Engineer's Backpack
  305. I:backpackT2=26456
  306.  
  307. # ID for the Smart Helmet item (set to 0 to disable)
  308. - I:smartHelmet=26457
  309. + I:smartHelmet=26455
  310. }
  311.  
  312.  
  313. diff -ur Direwolf20_1_5-server-1_1_2/config/NEI.cfg Direwolf20_1_5-server-newbeta/config/NEI.cfg
  314. --- Direwolf20_1_5-server-1_1_2/config/NEI.cfg 2013-08-03 13:01:26.000000000 -0500
  315. +++ Direwolf20_1_5-server-newbeta/config/NEI.cfg 2013-08-05 20:39:48.000000000 -0500
  316. @@ -19,10 +19,10 @@
  317. {
  318. blockIDs=true
  319. dump_on_load=false
  320. - itemIDs=false
  321. + itemIDs=true
  322. show_empty_blockIDs=false
  323. unused_blockIDs=true
  324. - unused_itemIDs=false
  325. + unused_itemIDs=true
  326. }
  327.  
  328. KeyBinding
  329. diff -ur Direwolf20_1_5-server-1_1_2/config/Natura.txt Direwolf20_1_5-server-newbeta/config/Natura.txt
  330. --- Direwolf20_1_5-server-1_1_2/config/Natura.txt 2013-08-03 13:01:12.000000000 -0500
  331. +++ Direwolf20_1_5-server-newbeta/config/Natura.txt 2013-08-05 20:39:22.000000000 -0500
  332. @@ -23,7 +23,10 @@
  333. I:"Glowing Mushroom"=3270
  334. I:"Green Glowshroom"=3274
  335. I:"Hopseed Door"=3265
  336. + I:"Log Slab"=3290
  337. I:"Nether Berry Bush"=3255
  338. + I:"Plank Slab One"=3288
  339. + I:"Plank Slab Two"=3289
  340. I:"Planks Block"=3262
  341. I:"Purple Glowshroom"=3275
  342. I:"Rare Leaves"=3278
  343. @@ -89,7 +92,7 @@
  344. B:"Generate Thornvines"=true
  345. B:"Generate Tigerwood Trees"=true
  346. B:"Generate Willow Trees"=true
  347. - B:"Override Nether"=false
  348. + B:"Override Nether"=true
  349. }
  350.  
  351.  
  352. @@ -170,10 +173,10 @@
  353.  
  354. terrain {
  355. # Requires blockID < 256
  356. - I:"Heat Sand"=252
  357. + I:"Heat Sand"=170
  358.  
  359. # Requires blockID < 256
  360. - I:"Tainted Soil"=253
  361. + I:"Tainted Soil"=169
  362. }
  363.  
  364.  
  365. @@ -185,33 +188,35 @@
  366. I:"Amaranth Tree Spawn Rarity"=1
  367. I:"Ash Cloud Spawn Height"=40
  368. I:"Ash Cloud Spawn Range"=78
  369. - I:"Ash Cloud Spawn Rarity"=80
  370. + I:"Ash Cloud Spawn Rarity"=160
  371. I:"Blackberry Spawn Range"=64
  372. I:"Blackberry Spawn Rarity"=48
  373. I:"Blightberry Spawn Range"=100
  374. - I:"Blightberry Spawn Rarity"=18
  375. - I:"Blood Tree Spawn Rarity"=14
  376. + I:"Blightberry Spawn Rarity"=40
  377. + I:"Blood Tree Spawn Rarity"=40
  378. I:"Blueberry Spawn Range"=64
  379. I:"Blueberry Spawn Rarity"=34
  380. I:"Bush Tree Spawn Range"=20
  381. I:"Bush Tree Spawn Rarity"=10
  382. I:"Cloud Spawn Height"=192
  383. I:"Cloud Spawn Range"=48
  384. - I:"Cloud Spawn Rarity"=100
  385. + I:"Cloud Spawn Rarity"=500
  386. I:"Dark Cloud Spawn Density"=10
  387. + I:"Dark Cloud Spawn Height"=64
  388. I:"Dark Cloud Spawn MinX"=0
  389. - I:"Dark Cloud Spawn Range"=256
  390. - I:"Darkwood Tree Spawn Rarity"=10
  391. + I:"Dark Cloud Spawn Range"=128
  392. + I:"Dark Cloud Spawn Rarity"=200
  393. + I:"Darkwood Tree Spawn Rarity"=20
  394. I:"Duskberry Spawn Range"=100
  395. - I:"Duskberry Spawn Rarity"=18
  396. + I:"Duskberry Spawn Rarity"=40
  397. I:"Fusewood Tree Spawn Rarity"=50
  398. - I:"Ghostwood Tree Spawn Rarity"=10
  399. + I:"Ghostwood Tree Spawn Rarity"=40
  400. I:"Maloberry Spawn Range"=64
  401. I:"Maloberry Spawn Rarity"=40
  402. I:"Maple Tree Spawn Rarity"=34
  403. I:"Raspberry Spawn Range"=64
  404. I:"Raspberry Spawn Rarity"=30
  405. - I:"Redwood Tree Spawn Rarity"=750
  406. + I:"Redwood Tree Spawn Rarity"=500
  407. I:"Saguaro Cactus Spawn Rarity"=5
  408. I:"Sakura Tree Spawn Range"=32
  409. I:"Sakura Tree Spawn Rarity"=10
  410. @@ -224,8 +229,8 @@
  411. I:"Stingberry Spawn Rarity"=18
  412. I:"Sulfur Cloud Spawn Height"=40
  413. I:"Sulfur Cloud Spawn Range"=78
  414. - I:"Sulfur Cloud Spawn Rarity"=80
  415. - I:"Thornvines Spawn Rarity"=40
  416. + I:"Sulfur Cloud Spawn Rarity"=160
  417. + I:"Thornvines Spawn Rarity"=80
  418. I:"Tigerwood Tree Spawn Rarity"=30
  419. I:"Willow Tree Spawn Rarity"=10
  420. }
  421. diff -ur Direwolf20_1_5-server-1_1_2/config/OCS.cfg Direwolf20_1_5-server-newbeta/config/OCS.cfg
  422. --- Direwolf20_1_5-server-1_1_2/config/OCS.cfg 2013-07-30 19:06:50.000000000 -0500
  423. +++ Direwolf20_1_5-server-newbeta/config/OCS.cfg 2013-08-01 04:51:08.000000000 -0500
  424. @@ -6,13 +6,13 @@
  425.  
  426. block {
  427. # The block ID for the basic sensor block
  428. - I:basicSensorBlockID=4093
  429. + I:basicSensorBlockID=4091
  430.  
  431. # The block ID for the gauge block
  432. - I:gaugeBlockID=4094
  433. + I:gaugeBlockID=4092
  434.  
  435. # The block ID for the sensor block
  436. - I:sensorBlockID=4095
  437. + I:sensorBlockID=4093
  438. }
  439.  
  440.  
  441. diff -ur Direwolf20_1_5-server-1_1_2/config/PortalGun.cfg Direwolf20_1_5-server-newbeta/config/PortalGun.cfg
  442. --- Direwolf20_1_5-server-1_1_2/config/PortalGun.cfg 2013-08-03 13:01:14.000000000 -0500
  443. +++ Direwolf20_1_5-server-newbeta/config/PortalGun.cfg 2013-08-05 20:39:34.000000000 -0500
  444. @@ -76,7 +76,7 @@
  445.  
  446. # What is the rarity of Portal Guns?
  447. # 1 - 100
  448. - I:lootRarityPortalGun=1
  449. + I:lootRarityPortalGun=2
  450.  
  451. # What is the rarity of Portal Spawners?
  452. # 1 - 100
  453. diff -ur Direwolf20_1_5-server-1_1_2/config/SoulShards.cfg Direwolf20_1_5-server-newbeta/config/SoulShards.cfg
  454. --- Direwolf20_1_5-server-1_1_2/config/SoulShards.cfg 2013-08-03 13:01:10.000000000 -0500
  455. +++ Direwolf20_1_5-server-newbeta/config/SoulShards.cfg 2013-08-05 20:39:30.000000000 -0500
  456. @@ -5,7 +5,7 @@
  457. ####################
  458.  
  459. block {
  460. - I:Soul_Cage=1475
  461. + I:Soul_Cage=1575
  462. }
  463.  
  464.  
  465. Only in Direwolf20_1_5-server-newbeta/config: Stackie.cfg
  466. diff -ur Direwolf20_1_5-server-1_1_2/config/StevesCarts.cfg Direwolf20_1_5-server-newbeta/config/StevesCarts.cfg
  467. --- Direwolf20_1_5-server-1_1_2/config/StevesCarts.cfg 2013-08-03 13:01:14.000000000 -0500
  468. +++ Direwolf20_1_5-server-newbeta/config/StevesCarts.cfg 2013-08-05 20:39:34.000000000 -0500
  469. @@ -6,11 +6,11 @@
  470.  
  471. block {
  472. I:AdvancedDetector=904
  473. - I:CargoManager=901
  474. - I:CartAssembler=902
  475. + I:CargoManager=911
  476. + I:CartAssembler=912
  477. I:Detector=907
  478. I:Distributor=906
  479. - I:Junctionrail=903
  480. + I:Junctionrail=913
  481. I:LiquidManager=909
  482. I:StorageBlocks=910
  483. I:Toggler=905
  484. diff -ur Direwolf20_1_5-server-1_1_2/config/Thaumcraft.cfg Direwolf20_1_5-server-newbeta/config/Thaumcraft.cfg
  485. --- Direwolf20_1_5-server-1_1_2/config/Thaumcraft.cfg 2013-08-03 13:01:20.000000000 -0500
  486. +++ Direwolf20_1_5-server-newbeta/config/Thaumcraft.cfg 2013-08-05 20:39:42.000000000 -0500
  487. @@ -82,7 +82,7 @@
  488.  
  489. general {
  490. # Enables a version of the Thauminomicon in creative mode that grants you all the research when you first use it.
  491. - B:allow_cheat_sheet=true
  492. + B:allow_cheat_sheet=false
  493.  
  494. # If set to false, warded stone, doors and glass will just be cosmetic in nature and not have its hardened properties (everyone will be able to break it with equal ease).
  495. B:allow_warded_stone=true
  496. Only in Direwolf20_1_5-server-newbeta/config: ThaumicBees.cfg
  497. diff -ur Direwolf20_1_5-server-1_1_2/config/ThaumicTinkerer.cfg Direwolf20_1_5-server-newbeta/config/ThaumicTinkerer.cfg
  498. --- Direwolf20_1_5-server-1_1_2/config/ThaumicTinkerer.cfg 2013-08-03 13:01:16.000000000 -0500
  499. +++ Direwolf20_1_5-server-newbeta/config/ThaumicTinkerer.cfg 2013-08-05 20:39:34.000000000 -0500
  500. @@ -9,7 +9,7 @@
  501. I:transmutator.aspectMultiplier=4
  502.  
  503. # Set to false to completely disable the transmutator.
  504. - B:transmutator.enable=true
  505. + B:transmutator.enable=false
  506.  
  507. # The maximum cost of an item that can be put in a transmutator. Cost refers to the total amount of aspect value.
  508. I:transmutator.maxValue=75
  509. @@ -34,10 +34,10 @@
  510. I:darkQuartzSlabFull=2157
  511. I:darkQuartzStairs=2156
  512. I:glowstoneGas=2150
  513. - I:interface=4094
  514. + I:interface=2148
  515. I:magnet=2161
  516. - I:mobMagnet=4095
  517. - I:nitorGas=4092
  518. + I:mobMagnet=2149
  519. + I:nitorGas=2192
  520. I:phantomStone=2159
  521. I:transmutator=2151
  522. I:wardChest=2152
  523. diff -ur Direwolf20_1_5-server-1_1_2/config/TinkersWorkshop.txt Direwolf20_1_5-server-newbeta/config/TinkersWorkshop.txt
  524. --- Direwolf20_1_5-server-1_1_2/config/TinkersWorkshop.txt 2013-08-03 13:01:10.000000000 -0500
  525. +++ Direwolf20_1_5-server-newbeta/config/TinkersWorkshop.txt 2013-08-05 20:39:30.000000000 -0500
  526. @@ -7,12 +7,14 @@
  527. block {
  528. I:Aggregator=3221
  529. I:Barricade=1469
  530. + I:"Birch Barricade"=1483
  531. I:"Clear Glass"=3223
  532. I:"Clear Stained Glass"=3225
  533. I:"Clear Stained Glass Pane"=3229
  534. I:"Drying Rack"=3227
  535. I:"Glass Pane"=3228
  536. I:"Held Item Block"=1472
  537. + I:"Jungle Barricade"=1487
  538. I:Landmine=1470
  539. I:"Lava Tank"=1473
  540. I:"Light Crystal"=3222
  541. @@ -21,10 +23,12 @@
  542. I:"Metal Storage"=1478
  543. I:"Multi Brick"=1481
  544. I:"Multi Brick Fancy"=1467
  545. + I:"Oak Barricade"=1469
  546. I:"Ore Berry One"=1485
  547. I:"Ore Berry Two"=1486
  548. I:"Ores Gravel"=1488
  549. - I:"Ores Slag"=4091
  550. + I:"Ores Slag"=1475
  551. + I:Punji=3232
  552. I:"Redstone Machines"=3226
  553. I:"Seared Slab"=3230
  554. I:"Seared Table"=1477
  555. @@ -32,6 +36,7 @@
  556. I:"Special Soil"=1476
  557. I:"Speed Block"=1489
  558. I:"Speed Slab"=3231
  559. + I:"Spruce Barricade"=1482
  560. I:"Stained Glass"=3224
  561. I:"Stone Torch"=1484
  562. I:"Tool Forge"=1468
  563. @@ -62,9 +67,11 @@
  564. B:"Keep levels on death"=true
  565. B:"Lower bronze output to 2 ingots"=false
  566. B:"Modifiers increase Mining Level"=true
  567. - B:"Remove Vanilla GregTech Nerfs"=true
  568. + B:"Remove Overworld void fog"=true
  569. + B:"Remove Vanilla GregTech Nerfs"=false
  570. B:"Remove Vanilla Tool Recipes"=false
  571. B:"Spawn beginner book"=true
  572. + B:"Turn water clear"=true
  573. }
  574.  
  575.  
  576. @@ -98,7 +105,9 @@
  577.  
  578. "mob spawning" {
  579. B:"Activate Blue Slime Spawns"=true
  580. - I:"Spawn Weight for Blue Slime"=7
  581. + B:"Activate Nitro Creeper Spawns"=true
  582. + I:"Spawn Weight for Blue Slime"=8
  583. + I:"Spawn Weight for Nitro Creeper"=8
  584. }
  585.  
  586.  
  587. @@ -182,7 +191,7 @@
  588. I:Excavator=14069
  589. I:"Frying Pan"=14058
  590. I:Hammer=14070
  591. - I:Hoe=31723
  592. + I:Hoe=14054
  593. I:Longbow=14062
  594. I:Longsword=14056
  595. I:"Lumber Axe"=14061
  596. @@ -206,6 +215,7 @@
  597. B:"Change Crafting Recipes"=false
  598. B:"Change Ghast drops to Gold Ingots"=false
  599. B:"Craft Stencil Tables"=true
  600. + B:"Necrotic modifier only heals on hostile mob kills"=false
  601. B:"Passive Health Regen"=true
  602. B:"Players drop heads on death"=false
  603. I:"World Border Radius"=1000
  604. @@ -220,35 +230,36 @@
  605. I:"Aluminum Bush Density"=2
  606. I:"Aluminum Bush Max Y"=60
  607. I:"Aluminum Bush Min Y"=0
  608. - I:"Aluminum Bush Rarity"=2
  609. - I:"Aluminum Surface Rarity"=50
  610. - I:"Aluminum Underground Density"=3
  611. + I:"Aluminum Bush Rarity"=1
  612. + I:"Aluminum Surface Rarity"=70
  613. + I:"Aluminum Underground Density"=1
  614. I:"Aluminum Underground Max Y"=64
  615. I:"Aluminum Underground Min Y"=0
  616. - I:"Cobalt Surface Rarity"=2000
  617. + I:"Cobalt Surface Rarity"=1500
  618. I:"Copper Bush Density"=2
  619. I:"Copper Bush Max Y"=60
  620. I:"Copper Bush Min Y"=20
  621. - I:"Copper Bush Rarity"=3
  622. - I:"Copper Surface Rarity"=100
  623. - I:"Copper Underground Density"=2
  624. + I:"Copper Bush Rarity"=1
  625. + I:"Copper Surface Rarity"=80
  626. + I:"Copper Underground Density"=0
  627. I:"Copper Underground Max Y"=60
  628. I:"Copper Underground Min Y"=20
  629. I:"Essence Bush Rarity"=6
  630. I:"Gold Bush Density"=1
  631. - I:"Gold Bush Rarity"=8
  632. - I:"Gold Surface Rarity"=900
  633. + I:"Gold Bush Rarity"=4
  634. + I:"Gold Surface Rarity"=700
  635. I:"Iron Bush Density"=1
  636. - I:"Iron Bush Rarity"=5
  637. - I:"Iron Surface Rarity"=400
  638. + I:"Iron Bush Rarity"=2
  639. + I:"Iron Surface Rarity"=200
  640. I:"Nether Ores Density"=8
  641. I:"Silver Bush Density"=1
  642. + I:"Silver Bush Rarity"=2
  643. I:"Tin Bush Density"=2
  644. I:"Tin Bush Max Y"=40
  645. I:"Tin Bush Min Y"=0
  646. - I:"Tin Bush Rarity"=3
  647. - I:"Tin Surface Rarity"=100
  648. - I:"Tin Underground Density"=2
  649. + I:"Tin Bush Rarity"=1
  650. + I:"Tin Surface Rarity"=80
  651. + I:"Tin Underground Density"=0
  652. I:"Tin Underground Max Y"=40
  653. I:"Tin Underground Min Y"=0
  654. }
  655. @@ -268,6 +279,7 @@
  656. B:"Generate Essence Bushes"=true
  657. B:"Generate Gold Bushes"=true
  658. B:"Generate Iron Bushes"=true
  659. + B:"Generate Silver Bushes"=true
  660. B:"Generate Surface Aluminum"=true
  661. B:"Generate Surface Copper"=true
  662. B:"Generate Surface Gold"=true
  663. Only in Direwolf20_1_5-server-newbeta/config: TradeBoothMod.cfg
  664. diff -ur Direwolf20_1_5-server-1_1_2/config/TwilightForest.cfg Direwolf20_1_5-server-newbeta/config/TwilightForest.cfg
  665. --- Direwolf20_1_5-server-1_1_2/config/TwilightForest.cfg 2013-08-03 13:01:10.000000000 -0500
  666. +++ Direwolf20_1_5-server-newbeta/config/TwilightForest.cfg 2013-08-05 20:39:30.000000000 -0500
  667. @@ -50,6 +50,7 @@
  668. I:Roots=2170
  669. I:Sapling=2175
  670. I:Shield=2182
  671. + I:TowerAntenna=2182
  672. I:TowerDevice=2181
  673. I:TowerTranslucent=2183
  674. I:TowerWood=2180
  675. Only in Direwolf20_1_5-server-newbeta/config: UndergroundBiomes.cfg
  676. Only in Direwolf20_1_5-server-newbeta/config: UniversalElectricity
  677. Only in Direwolf20_1_5-server-newbeta/config: Vending.cfg
  678. diff -ur Direwolf20_1_5-server-1_1_2/config/WirelessRedstone.cfg Direwolf20_1_5-server-newbeta/config/WirelessRedstone.cfg
  679. --- Direwolf20_1_5-server-1_1_2/config/WirelessRedstone.cfg 2013-08-03 13:01:24.000000000 -0500
  680. +++ Direwolf20_1_5-server-newbeta/config/WirelessRedstone.cfg 2013-08-05 20:39:44.000000000 -0500
  681. @@ -70,5 +70,3 @@
  682. triangulator.id=6101
  683. wirelessMap.id=6104
  684. }
  685. -
  686. -AdvancedGui=false
  687. diff -ur Direwolf20_1_5-server-1_1_2/config/buildcraft/main.conf Direwolf20_1_5-server-newbeta/config/buildcraft/main.conf
  688. --- Direwolf20_1_5-server-1_1_2/config/buildcraft/main.conf 2013-08-03 13:01:04.000000000 -0500
  689. +++ Direwolf20_1_5-server-newbeta/config/buildcraft/main.conf 2013-08-05 20:39:22.000000000 -0500
  690. @@ -100,6 +100,7 @@
  691. # pipes containing more than this amount of items will explode, not dropping any item
  692. I:pipes.maxItems=100
  693. S:power.framework=buildcraft.energy.PneumaticPowerFramework
  694. + B:power.usePipeLoss=true
  695. S:pumping.controlList=+/*/*,+/-1/Lava
  696. B:trackNetworkUsage=false
  697. S:version=3.7.2
  698. @@ -161,3 +162,12 @@
  699. }
  700.  
  701.  
  702. +####################
  703. +# vars
  704. +####################
  705. +
  706. +vars {
  707. + S:version.seen=3.6.0
  708. +}
  709. +
  710. +
  711. diff -ur Direwolf20_1_5-server-1_1_2/config/cofh/Core.cfg Direwolf20_1_5-server-newbeta/config/cofh/Core.cfg
  712. --- Direwolf20_1_5-server-1_1_2/config/cofh/Core.cfg 2013-08-03 13:01:24.000000000 -0500
  713. +++ Direwolf20_1_5-server-newbeta/config/cofh/Core.cfg 2013-08-05 20:39:44.000000000 -0500
  714. @@ -17,7 +17,7 @@
  715. B:AllowOps=true
  716.  
  717. # Allows Ops to set the capes of others, if Ops are allowed to set capes.
  718. - B:AllowOpsToSetOthers=false
  719. + B:AllowOpsToSetOthers=true
  720. }
  721.  
  722. ####################
  723. @@ -32,7 +32,7 @@
  724. B:AllowOps=true
  725.  
  726. # Allows Ops to set the skins of others, if Ops are allowed to set skins.
  727. - B:AllowOpsToSetOthers=false
  728. + B:AllowOpsToSetOthers=true
  729. }
  730.  
  731. ####################
  732. diff -ur Direwolf20_1_5-server-1_1_2/config/cofh/Lexicon_Whitelist.txt Direwolf20_1_5-server-newbeta/config/cofh/Lexicon_Whitelist.txt
  733. --- Direwolf20_1_5-server-1_1_2/config/cofh/Lexicon_Whitelist.txt 2013-07-30 19:06:20.000000000 -0500
  734. +++ Direwolf20_1_5-server-newbeta/config/cofh/Lexicon_Whitelist.txt 2013-08-01 04:51:08.000000000 -0500
  735. @@ -1,112 +1,311 @@
  736. -blockAluminumBrass
  737. -blockAlumite
  738. -blockArdite
  739. -blockBronze
  740. -blockCobalt
  741. -blockCopper
  742. -blockElectrum
  743. -blockInvar
  744. -blockLead
  745. -blockManyullyn
  746. -blockNaturalAluminum
  747. -blockNickel
  748. -blockPlatinum
  749. -blockSilver
  750. -blockSteel
  751. -blockTin
  752. -blockUranium
  753. -dustAluminumBrass
  754. -dustAlumite
  755. -dustArdite
  756. -dustAsh
  757. -dustBrass
  758. -dustBronze
  759. -dustCertusQuartz
  760. -dustCharcoal
  761. -dustClay
  762. -dustCoal
  763. -dustCobalt
  764. -dustCopper
  765. -dustElectrum
  766. -dustGold
  767. -dustInvar
  768. -dustIron
  769. -dustLead
  770. -dustManyullyn
  771. -dustNaturalAluminum
  772. -dustNetherQuartz
  773. -dustNickel
  774. -dustObsidian
  775. -dustPlastic
  776. -dustPlatinum
  777. -dustQuartz
  778. -dustSaltpeter
  779. -dustSilver
  780. -dustSteel
  781. -dustSulfur
  782. -dustTin
  783. -dustTitanium
  784. -dustTungsten
  785. -dustWheat
  786. -dustZinc
  787. -ingotAluminumBrass
  788. -ingotAlumite
  789. -ingotArdite
  790. -ingotBrass
  791. -ingotBronze
  792. -ingotCobalt
  793. -ingotCopper
  794. -ingotElectrum
  795. -ingotGold
  796. -ingotInvar
  797. -ingotIron
  798. -ingotLead
  799. -ingotManyullyn
  800. -ingotMeat
  801. -ingotMeatRaw
  802. -ingotNaturalAluminum
  803. -ingotNickel
  804. -ingotPlatinum
  805. -ingotRefinedIron
  806. -ingotSilver
  807. -ingotSteel
  808. -ingotTin
  809. -ingotTitanium
  810. -ingotTungsten
  811. -ingotUranium
  812. -ingotZinc
  813. -nuggetAluminumBrass
  814. -nuggetCopper
  815. -nuggetElectrum
  816. -nuggetInvar
  817. -nuggetIron
  818. -nuggetLead
  819. -nuggetMeat
  820. -nuggetMeatRaw
  821. -nuggetNaturalAluminum
  822. -nuggetNickel
  823. -nuggetPlatinum
  824. -nuggetSilver
  825. -nuggetSteel
  826. -nuggetTin
  827. -oreApatite
  828. -oreArdite
  829. -oreCertusQuartz
  830. -oreCobalt
  831. -oreCopper
  832. -oreDiamond
  833. -oreEmerald
  834. -oreGold
  835. -oreIron
  836. -oreLapis
  837. -oreLead
  838. -oreNaturalAluminum
  839. -oreNickel
  840. -orePlatinum
  841. -oreQuartz
  842. -oreRedstone
  843. -oreSaltpeter
  844. -oreSilver
  845. -oreSulfur
  846. -oreTin
  847. -oreUranium
  848. +blockAluminium
  849. +blockAluminum
  850. +blockAluminumBrass
  851. +blockAlumite
  852. +blockApatite
  853. +blockArdite
  854. +blockBrass
  855. +blockBronze
  856. +blockChrome
  857. +blockCobalt
  858. +blockCopper
  859. +blockDiamond
  860. +blockElectrum
  861. +blockEmerald
  862. +blockEnderPearl
  863. +blockGarnetRed
  864. +blockGarnetYellow
  865. +blockGold
  866. +blockGreenSapphire
  867. +blockInvar
  868. +blockIridium
  869. +blockIron
  870. +blockLapis
  871. +blockLead
  872. +blockManyullyn
  873. +blockNaturalAluminum
  874. +blockNickel
  875. +blockOlivine
  876. +blockOsmium
  877. +blockPlatinum
  878. +blockPlutonium
  879. +blockRedstone
  880. +blockRefinedIron
  881. +blockRuby
  882. +blockSapphire
  883. +blockSilver
  884. +blockSteel
  885. +blockThorium
  886. +blockTin
  887. +blockTitanium
  888. +blockTungsten
  889. +blockTungstenSteel
  890. +blockUranium
  891. +blockZinc
  892. +crafting100kEUStore
  893. +crafting10kCoolantStore
  894. +crafting10kEUStore
  895. +crafting10kkEUStore
  896. +crafting180kCoolantStore
  897. +crafting1kkEUStore
  898. +crafting30kCoolantStore
  899. +crafting360kCoolantStore
  900. +crafting60kCoolantStore
  901. +craftingIndustrialDiamond
  902. +dustAlmandine
  903. +dustAluminium
  904. +dustAluminumBrass
  905. +dustAlumite
  906. +dustAndradite
  907. +dustArdite
  908. +dustAsh
  909. +dustBasalt
  910. +dustBauxite
  911. +dustBrass
  912. +dustBronze
  913. +dustCalcite
  914. +dustCertusQuartz
  915. +dustCharcoal
  916. +dustChrome
  917. +dustCinnabar
  918. +dustClay
  919. +dustCoal
  920. +dustCobalt
  921. +dustCopper
  922. +dustDarkAsh
  923. +dustDiamond
  924. +dustElectrum
  925. +dustEmerald
  926. +dustEnderEye
  927. +dustEnderPearl
  928. +dustEndstone
  929. +dustFlint
  930. +dustGalena
  931. +dustGarnetRed
  932. +dustGarnetYellow
  933. +dustGlowstone
  934. +dustGold
  935. +dustGreenSapphire
  936. +dustGrossular
  937. +dustGunpowder
  938. +dustInvar
  939. +dustIridium
  940. +dustIron
  941. +dustLapis
  942. +dustLazurite
  943. +dustLead
  944. +dustMagnalium
  945. +dustMagnesium
  946. +dustManganese
  947. +dustManyullyn
  948. +dustMarble
  949. +dustNaturalAluminum
  950. +dustNetherQuartz
  951. +dustNetherrack
  952. +dustNickel
  953. +dustNikolite
  954. +dustObsidian
  955. +dustOlivine
  956. +dustOsmium
  957. +dustPhosphorus
  958. +dustPlastic
  959. +dustPlatinum
  960. +dustPlutonium
  961. +dustPyrite
  962. +dustPyrope
  963. +dustQuartz
  964. +dustRedRock
  965. +dustRedstone
  966. +dustRefinedIron
  967. +dustRuby
  968. +dustSaltpeter
  969. +dustSapphire
  970. +dustSilicon
  971. +dustSilver
  972. +dustSmallAlmandine
  973. +dustSmallAluminium
  974. +dustSmallAndradite
  975. +dustSmallAsh
  976. +dustSmallBasalt
  977. +dustSmallBauxite
  978. +dustSmallBrass
  979. +dustSmallBronze
  980. +dustSmallCalcite
  981. +dustSmallCharcoal
  982. +dustSmallChrome
  983. +dustSmallCinnabar
  984. +dustSmallClay
  985. +dustSmallCoal
  986. +dustSmallCopper
  987. +dustSmallDarkAsh
  988. +dustSmallDiamond
  989. +dustSmallElectrum
  990. +dustSmallEmerald
  991. +dustSmallEnderEye
  992. +dustSmallEnderPearl
  993. +dustSmallEndstone
  994. +dustSmallFlint
  995. +dustSmallGalena
  996. +dustSmallGarnetRed
  997. +dustSmallGarnetYellow
  998. +dustSmallGlowstone
  999. +dustSmallGold
  1000. +dustSmallGreenSapphire
  1001. +dustSmallGrossular
  1002. +dustSmallGunpowder
  1003. +dustSmallInvar
  1004. +dustSmallIron
  1005. +dustSmallLazurite
  1006. +dustSmallLead
  1007. +dustSmallMagnesium
  1008. +dustSmallManganese
  1009. +dustSmallMarble
  1010. +dustSmallNetherrack
  1011. +dustSmallNickel
  1012. +dustSmallObsidian
  1013. +dustSmallOlivine
  1014. +dustSmallOsmium
  1015. +dustSmallPhosphorus
  1016. +dustSmallPlatinum
  1017. +dustSmallPlutonium
  1018. +dustSmallPyrite
  1019. +dustSmallPyrope
  1020. +dustSmallRedRock
  1021. +dustSmallRedstone
  1022. +dustSmallRefinedIron
  1023. +dustSmallRuby
  1024. +dustSmallSaltpeter
  1025. +dustSmallSapphire
  1026. +dustSmallSilver
  1027. +dustSmallSodalite
  1028. +dustSmallSpessartine
  1029. +dustSmallSphalerite
  1030. +dustSmallSteel
  1031. +dustSmallSulfur
  1032. +dustSmallThorium
  1033. +dustSmallTin
  1034. +dustSmallTitanium
  1035. +dustSmallTungsten
  1036. +dustSmallUranium
  1037. +dustSmallUvarovite
  1038. +dustSmallWood
  1039. +dustSmallZinc
  1040. +dustSodalite
  1041. +dustSpessartine
  1042. +dustSphalerite
  1043. +dustSteel
  1044. +dustSugar
  1045. +dustSulfur
  1046. +dustThorium
  1047. +dustTin
  1048. +dustTitanium
  1049. +dustTungsten
  1050. +dustTungstenSteel
  1051. +dustUranium
  1052. +dustUvarovite
  1053. +dustWheat
  1054. +dustWood
  1055. +dustZinc
  1056. +ingotAluminium
  1057. +ingotAluminumBrass
  1058. +ingotAlumite
  1059. +ingotArdite
  1060. +ingotBrass
  1061. +ingotBronze
  1062. +ingotChrome
  1063. +ingotCobalt
  1064. +ingotCopper
  1065. +ingotDiamond
  1066. +ingotElectrum
  1067. +ingotEmerald
  1068. +ingotGold
  1069. +ingotGreenSapphire
  1070. +ingotInvar
  1071. +ingotIridium
  1072. +ingotIron
  1073. +ingotLapis
  1074. +ingotLead
  1075. +ingotMagnalium
  1076. +ingotMagnesium
  1077. +ingotManyullyn
  1078. +ingotNaturalAluminum
  1079. +ingotNickel
  1080. +ingotOlivine
  1081. +ingotOsmium
  1082. +ingotPlatinum
  1083. +ingotPlutonium
  1084. +ingotRedstone
  1085. +ingotRefinedIron
  1086. +ingotRuby
  1087. +ingotSapphire
  1088. +ingotSilicon
  1089. +ingotSilver
  1090. +ingotSteel
  1091. +ingotThorium
  1092. +ingotTin
  1093. +ingotTitanium
  1094. +ingotTungsten
  1095. +ingotTungstenSteel
  1096. +ingotUranium
  1097. +ingotZinc
  1098. +nuggetAluminium
  1099. +nuggetAluminumBrass
  1100. +nuggetBrass
  1101. +nuggetBronze
  1102. +nuggetChrome
  1103. +nuggetCopper
  1104. +nuggetElectrum
  1105. +nuggetGold
  1106. +nuggetInvar
  1107. +nuggetIridium
  1108. +nuggetIron
  1109. +nuggetLead
  1110. +nuggetNaturalAluminum
  1111. +nuggetNickel
  1112. +nuggetOsmium
  1113. +nuggetPlatinum
  1114. +nuggetSilver
  1115. +nuggetSteel
  1116. +nuggetTin
  1117. +nuggetTitanium
  1118. +nuggetTungsten
  1119. +nuggetZinc
  1120. +oreApatite
  1121. +oreArdite
  1122. +oreBauxite
  1123. +oreBrass
  1124. +oreBronze
  1125. +oreCertusQuartz
  1126. +oreCoal
  1127. +oreCobalt
  1128. +oreCopper
  1129. +oreDiamond
  1130. +oreEmerald
  1131. +oreEndCooperite
  1132. +oreEndOlivine
  1133. +oreEndSodalite
  1134. +oreEndTungstate
  1135. +oreGalena
  1136. +oreGold
  1137. +oreIridium
  1138. +oreIron
  1139. +oreLapis
  1140. +oreLead
  1141. +oreMonazit
  1142. +oreNaturalAluminum
  1143. +oreNetherCinnabar
  1144. +oreNetherPyrite
  1145. +oreNetherQuartz
  1146. +oreNetherSphalerite
  1147. +oreNickel
  1148. +orePlatinum
  1149. +oreQuartz
  1150. +oreRedstone
  1151. +oreRuby
  1152. +oreSaltpeter
  1153. +oreSapphire
  1154. +oreSilver
  1155. +oreSulfur
  1156. +oreTin
  1157. +oreUranium
  1158. +oreZinc
  1159. diff -ur Direwolf20_1_5-server-1_1_2/config/cofh/OmniTools.cfg Direwolf20_1_5-server-newbeta/config/cofh/OmniTools.cfg
  1160. --- Direwolf20_1_5-server-1_1_2/config/cofh/OmniTools.cfg 2013-08-03 13:01:26.000000000 -0500
  1161. +++ Direwolf20_1_5-server-newbeta/config/cofh/OmniTools.cfg 2013-08-05 20:39:48.000000000 -0500
  1162. @@ -22,7 +22,7 @@
  1163. ####################
  1164.  
  1165. general {
  1166. - B:EnableUpdateNotifications=true
  1167. + B:EnableUpdateNotifications=false
  1168.  
  1169. # This will generate a default List file depending on your list setting. This file will ONLY generate if it does not exist.
  1170. B:Lexicon.GenerateDefaultList=true
  1171. @@ -41,8 +41,8 @@
  1172. ####################
  1173.  
  1174. item {
  1175. - I:Artifact=31721
  1176. - I:OmniWrench=31722
  1177. + I:Artifact=21740
  1178. + I:OmniWrench=21741
  1179. ####################
  1180. # feature
  1181. ####################
  1182. diff -ur Direwolf20_1_5-server-1_1_2/config/cofh/ThermalExpansion.cfg Direwolf20_1_5-server-newbeta/config/cofh/ThermalExpansion.cfg
  1183. --- Direwolf20_1_5-server-1_1_2/config/cofh/ThermalExpansion.cfg 2013-08-03 13:01:24.000000000 -0500
  1184. +++ Direwolf20_1_5-server-newbeta/config/cofh/ThermalExpansion.cfg 2013-08-05 20:39:46.000000000 -0500
  1185. @@ -145,6 +145,7 @@
  1186. I:Crucible.BlazeRod.Energy=2000
  1187. B:Crucible.Netherrack=true
  1188. I:Crucible.Netherrack.Energy=12000
  1189. + I:EnergyFramework.Redstone.Loss=5
  1190. I:LavaMJValue=20000
  1191.  
  1192. # Enable this for Liquid Ender to randomly teleport entities on contact.
  1193. @@ -172,18 +173,20 @@
  1194. I:RockGen.Stone.Time=80
  1195. I:RockGen.Stone.Water=1000
  1196. I:Smelter.Bronze.Amount=2
  1197. + I:Tesseract.Energy.Loss=25
  1198. + I:Tesseract.Energy.MaxTransfer=100
  1199. I:WaterGen.Rate=25
  1200. ####################
  1201. # craftinghandlers
  1202. ####################
  1203.  
  1204. craftinghandlers {
  1205. - B:Crucible.Override=false
  1206. - B:Furnace.Override=false
  1207. - B:Pulverizer.Override=false
  1208. - B:Sawmill.Override=false
  1209. - B:Smelter.Override=false
  1210. - B:Transposer.Override=false
  1211. + B:Crucible.Override=true
  1212. + B:Furnace.Override=true
  1213. + B:Pulverizer.Override=true
  1214. + B:Sawmill.Override=true
  1215. + B:Smelter.Override=true
  1216. + B:Transposer.Override=true
  1217. }
  1218.  
  1219. ####################
  1220. @@ -217,6 +220,33 @@
  1221. B:Ore.Tin=true
  1222. }
  1223.  
  1224. + ####################
  1225. + # tweak
  1226. + ####################
  1227. +
  1228. + tweak {
  1229. + I:Ore.Copper.ClusterSize=8
  1230. + I:Ore.Copper.MaxY=75
  1231. + I:Ore.Copper.MinY=40
  1232. + I:Ore.Copper.NumClusters=12
  1233. + I:Ore.Lead.ClusterSize=8
  1234. + I:Ore.Lead.MaxY=35
  1235. + I:Ore.Lead.MinY=10
  1236. + I:Ore.Lead.NumClusters=4
  1237. + I:Ore.Nickel.ClusterSize=4
  1238. + I:Ore.Nickel.MaxY=20
  1239. + I:Ore.Nickel.MinY=5
  1240. + I:Ore.Nickel.NumClusters=2
  1241. + I:Ore.Silver.ClusterSize=8
  1242. + I:Ore.Silver.MaxY=30
  1243. + I:Ore.Silver.MinY=5
  1244. + I:Ore.Silver.NumClusters=4
  1245. + I:Ore.Tin.ClusterSize=8
  1246. + I:Ore.Tin.MaxY=55
  1247. + I:Ore.Tin.MinY=20
  1248. + I:Ore.Tin.NumClusters=9
  1249. + }
  1250. +
  1251. }
  1252.  
  1253.  
  1254. diff -ur Direwolf20_1_5-server-1_1_2/config/cofh/World.cfg Direwolf20_1_5-server-newbeta/config/cofh/World.cfg
  1255. --- Direwolf20_1_5-server-1_1_2/config/cofh/World.cfg 2013-08-03 13:01:20.000000000 -0500
  1256. +++ Direwolf20_1_5-server-newbeta/config/cofh/World.cfg 2013-08-05 20:39:40.000000000 -0500
  1257. @@ -9,10 +9,10 @@
  1258. B:AllowCustomGeneration=false
  1259.  
  1260. # This will flatten the bedrock layer to a single block in height.
  1261. - B:FlatBedrock=false
  1262. + B:FlatBedrock=true
  1263.  
  1264. # This allows for vanilla ore generation to be REPLACED. Configure in the 'world.vanilla' section; vanilla defaults have been provided.
  1265. - B:ReplaceVanillaGeneration=false
  1266. + B:ReplaceVanillaGeneration=true
  1267.  
  1268. # If FlatBedrock is enabled, this will enforce it in previously generated chunks.
  1269. B:RetroactiveFlatBedrock=false
  1270. @@ -51,11 +51,11 @@
  1271. ####################
  1272. # gravel
  1273. #===================
  1274. - # <UNIFORM> Generation settings for Gravel; Defaults: ClusterSize = 32, NumClusters = 10, MinY = 0, MaxY = 128
  1275. + # <UNIFORM> Generation settings for Gravel; Defaults: ClusterSize = 24, NumClusters = 10, MinY = 0, MaxY = 128
  1276. ####################
  1277.  
  1278. gravel {
  1279. - I:ClusterSize=32
  1280. + I:ClusterSize=24
  1281. I:MaxY=128
  1282. I:MinY=0
  1283. I:NumClusters=10
  1284. @@ -79,11 +79,11 @@
  1285. ####################
  1286. # iron
  1287. #===================
  1288. - # <UNIFORM> Generation settings for Iron; Defaults: ClusterSize = 8, NumClusters = 20, MinY = 0, MaxY = 64
  1289. + # <UNIFORM> Generation settings for Iron; Defaults: ClusterSize = 12, NumClusters = 20, MinY = 0, MaxY = 64
  1290. ####################
  1291.  
  1292. iron {
  1293. - I:ClusterSize=8
  1294. + I:ClusterSize=12
  1295. I:MaxY=64
  1296. I:MinY=0
  1297. I:NumClusters=20
  1298. @@ -93,27 +93,27 @@
  1299. ####################
  1300. # gold
  1301. #===================
  1302. - # <UNIFORM> Generation settings for Gold; Defaults: ClusterSize = 8, NumClusters = 2, MinY = 0, MaxY = 32
  1303. + # <UNIFORM> Generation settings for Gold; Defaults: ClusterSize = 12, NumClusters = 3, MinY = 0, MaxY = 32
  1304. ####################
  1305.  
  1306. gold {
  1307. - I:ClusterSize=8
  1308. + I:ClusterSize=12
  1309. I:MaxY=32
  1310. I:MinY=0
  1311. - I:NumClusters=2
  1312. + I:NumClusters=3
  1313. B:RetroGen=false
  1314. }
  1315.  
  1316. ####################
  1317. # redstone
  1318. #===================
  1319. - # <UNIFORM> Generation settings for Redstone; Defaults: ClusterSize = 7, NumClusters = 8, MinY = 0, MaxY = 16
  1320. + # <UNIFORM> Generation settings for Redstone; Defaults: ClusterSize = 8, NumClusters = 8, MinY = 5, MaxY = 20
  1321. ####################
  1322.  
  1323. redstone {
  1324. - I:ClusterSize=7
  1325. - I:MaxY=16
  1326. - I:MinY=0
  1327. + I:ClusterSize=8
  1328. + I:MaxY=20
  1329. + I:MinY=5
  1330. I:NumClusters=8
  1331. B:RetroGen=false
  1332. }
  1333. @@ -121,13 +121,13 @@
  1334. ####################
  1335. # diamond
  1336. #===================
  1337. - # <UNIFORM> Generation settings for Diamond; Defaults: ClusterSize = 7, NumClusters = 1, MinY = 0, MaxY = 16
  1338. + # <UNIFORM> Generation settings for Diamond; Defaults: ClusterSize = 10, NumClusters = 1, MinY = 5, MaxY = 20
  1339. ####################
  1340.  
  1341. diamond {
  1342. - I:ClusterSize=7
  1343. - I:MaxY=16
  1344. - I:MinY=0
  1345. + I:ClusterSize=10
  1346. + I:MaxY=20
  1347. + I:MinY=5
  1348. I:NumClusters=1
  1349. B:RetroGen=false
  1350. }
  1351. @@ -141,7 +141,9 @@
  1352. lapis {
  1353. I:ClusterSize=6
  1354. I:MaxVar=16
  1355. + I:MaxY=16
  1356. I:MeanY=16
  1357. + I:MinY=16
  1358. I:NumClusters=1
  1359. B:RetroGen=false
  1360. }
  1361. @@ -170,14 +172,14 @@
  1362. ####################
  1363. # tin
  1364. #===================
  1365. - # <UNIFORM> Generation settings for Tin; Defaults: ClusterSize = 8, NumClusters = 7, MinY = 20, MaxY = 55
  1366. + # <UNIFORM> Generation settings for Tin; Defaults: ClusterSize = 8, NumClusters = 10, MinY = 20, MaxY = 55
  1367. ####################
  1368.  
  1369. tin {
  1370. I:ClusterSize=8
  1371. I:MaxY=55
  1372. I:MinY=20
  1373. - I:NumClusters=7
  1374. + I:NumClusters=10
  1375. B:RetroGen=true
  1376. }
  1377.  
  1378. diff -ur Direwolf20_1_5-server-1_1_2/config/cofh/WorldCustomGen.txt Direwolf20_1_5-server-newbeta/config/cofh/WorldCustomGen.txt
  1379. --- Direwolf20_1_5-server-1_1_2/config/cofh/WorldCustomGen.txt 2013-07-30 19:06:20.000000000 -0500
  1380. +++ Direwolf20_1_5-server-newbeta/config/cofh/WorldCustomGen.txt 2013-08-01 04:51:08.000000000 -0500
  1381. @@ -1,13 +1,13 @@
  1382. -#This file allows for the addition of custom generation TEMPLATES to World.cfg.
  1383. -#Generation parameters are changed inside World.cfg.
  1384. -#These values are only used as defaults and in the template comments.
  1385. -#
  1386. -#Format (TAB DELIMITED): GenType Name BlockID BlockMeta ClusterSize NumClusters minY maxY regen
  1387. -#GenType is either UNIFORM or NORMAL. If NORMAL, minY is the average height and maxY is the maximum variance.
  1388. -#
  1389. -#Creates a template with default values of 4 clusters of 4 ores (1000:0) randomly between y = 32 and y = 64. Retrogen Enabled:
  1390. -#UNIFORM testUniform 1000 0 4 4 32 64 true
  1391. -#
  1392. -#Creates a template with default values of 6 clusters of 16 ores (1000:1) in a 32-height Normal Distribution centered at y = 32. RetroGen Disabled:
  1393. -#NORMAL testNormal 1000 1 16 6 32 16 false
  1394. -#
  1395. +#This file allows for the addition of custom generation TEMPLATES to World.cfg.
  1396. +#Generation parameters are changed inside World.cfg.
  1397. +#These values are only used as defaults and in the template comments.
  1398. +#
  1399. +#Format (TAB DELIMITED): GenType Name BlockID BlockMeta ClusterSize NumClusters minY maxY regen
  1400. +#GenType is either UNIFORM or NORMAL. If NORMAL, minY is the average height and maxY is the maximum variance.
  1401. +#
  1402. +#Creates a template with default values of 4 clusters of 4 ores (1000:0) randomly between y = 32 and y = 64. Retrogen Enabled:
  1403. +#UNIFORM testUniform 1000 0 4 4 32 64 true
  1404. +#
  1405. +#Creates a template with default values of 6 clusters of 16 ores (1000:1) in a 32-height Normal Distribution centered at y = 32. RetroGen Disabled:
  1406. +#NORMAL testNormal 1000 1 16 6 32 16 false
  1407. +#
  1408. Only in Direwolf20_1_5-server-newbeta/config: dartcraft.cfg
  1409. Only in Direwolf20_1_5-server-newbeta/config: deathTimer.cfg
  1410. diff -ur Direwolf20_1_5-server-1_1_2/config/denLib.cfg Direwolf20_1_5-server-newbeta/config/denLib.cfg
  1411. --- Direwolf20_1_5-server-1_1_2/config/denLib.cfg 2013-07-30 20:45:42.000000000 -0500
  1412. +++ Direwolf20_1_5-server-newbeta/config/denLib.cfg 2013-08-05 12:51:24.000000000 -0500
  1413. @@ -5,6 +5,10 @@
  1414. ####################
  1415.  
  1416. versiondisplay {
  1417. + B:"Plugins for Forestry11"=true
  1418. + B:"Plugins for Forestry13"=true
  1419. + B:"Plugins for Forestry14"=true
  1420. + B:"Plugins for Forestry16"=true
  1421. B:"Plugins for Forestry17"=true
  1422. }
  1423.  
  1424. Only in Direwolf20_1_5-server-newbeta/config/denoflionsx: CreeperCollateral
  1425. Only in Direwolf20_1_5-server-newbeta/config/denoflionsx: DenPipes
  1426. Only in Direwolf20_1_5-server-newbeta/config/denoflionsx: GateCopy
  1427. Binary files Direwolf20_1_5-server-1_1_2/config/denoflionsx/PluginsforForestry/Mappings/MetaMap.BiMap and Direwolf20_1_5-server-newbeta/config/denoflionsx/PluginsforForestry/Mappings/MetaMap.BiMap differ
  1428. diff -ur Direwolf20_1_5-server-1_1_2/config/denoflionsx/PluginsforForestry/PluginsforForestry.cfg Direwolf20_1_5-server-newbeta/config/denoflionsx/PluginsforForestry/PluginsforForestry.cfg
  1429. --- Direwolf20_1_5-server-1_1_2/config/denoflionsx/PluginsforForestry/PluginsforForestry.cfg 2013-08-03 13:01:14.000000000 -0500
  1430. +++ Direwolf20_1_5-server-newbeta/config/denoflionsx/PluginsforForestry/PluginsforForestry.cfg 2013-08-05 20:39:34.000000000 -0500
  1431. @@ -120,16 +120,17 @@
  1432. ####################
  1433.  
  1434. items {
  1435. - I:barrel_ItemID=4345
  1436. - I:can_ItemID=4348
  1437. - I:capsule_ItemID=4346
  1438. - I:hammer_ItemID=4349
  1439. - I:liquidpeat_ItemID=4352
  1440. - I:redcapsule_ItemID=4347
  1441. - I:rings_ItemID=4350
  1442. + I:barrel_ItemID=4100
  1443. + I:barrel_capacity=31741
  1444. + I:can_ItemID=4103
  1445. + I:capsule_ItemID=4101
  1446. + I:hammer_ItemID=4104
  1447. + I:liquidpeat_ItemID=4151
  1448. + I:redcapsule_ItemID=4102
  1449. + I:rings_ItemID=31740
  1450.  
  1451. # Liquids only consume one item or block id depending on mode.
  1452. - I:veggiejuice_ItemID=4351
  1453. + I:veggiejuice_ItemID=4150
  1454.  
  1455. # Void bucket is incomplete and forcefully disabled.
  1456. I:voidbucket_ItemID=4353
  1457. @@ -140,9 +141,9 @@
  1458. ####################
  1459.  
  1460. buckets {
  1461. - I:bucket_filled_ItemID=4446
  1462. + I:bucket_filled_ItemID=4445
  1463. I:woodenbucket_ItemID=4444
  1464. - I:woodenbucket_filled_ItemID=4445
  1465. + I:woodenbucket_filled_ItemID=31742
  1466. }
  1467.  
  1468. }
  1469. @@ -188,7 +189,7 @@
  1470.  
  1471. items {
  1472. # Meta Item. Contains Sugar Charcoal, Sugar Coke, Cactus Charcoal, Cactus Coke.
  1473. - I:plugin_railcraft_charcoal=4344
  1474. + I:plugin_railcraft_charcoal=4152
  1475. }
  1476.  
  1477. }
  1478. Only in Direwolf20_1_5-server-newbeta/config: eplus.cfg
  1479. diff -ur Direwolf20_1_5-server-1_1_2/config/factorization.cfg Direwolf20_1_5-server-newbeta/config/factorization.cfg
  1480. --- Direwolf20_1_5-server-1_1_2/config/factorization.cfg 2013-08-03 13:01:08.000000000 -0500
  1481. +++ Direwolf20_1_5-server-newbeta/config/factorization.cfg 2013-08-05 20:39:28.000000000 -0500
  1482. @@ -45,7 +45,7 @@
  1483. B:notifyInChat=false
  1484.  
  1485. # 3 keys for: removing (x), cycling (c), balancing (b)
  1486. - S:pocketCraftingActionKeys=xcbf
  1487. + S:pocketCraftingActionKeys=xcb
  1488.  
  1489. # If false, never use smooth lighting for drawing sculptures
  1490. B:renderAmbientOcclusion=true
  1491. @@ -119,6 +119,15 @@
  1492. I:logicMatrixID=9045
  1493. I:logicMatrixProgrammer=9043
  1494. I:magnet=9025
  1495. + I:mechaBouyantBarrel=9021
  1496. + I:mechaChasis=9009
  1497. + I:mechaChest=9011
  1498. + I:mechaCobbleDrive=9022
  1499. + I:mechaFoot=9013
  1500. + I:mechaHead=9010
  1501. + I:mechaLeg=9012
  1502. + I:mechaMountedPiston=9023
  1503. + I:mechaSpring=9047
  1504. I:mirror=9030
  1505. I:motor=9027
  1506. I:netherPowder=9050
  1507. @@ -147,6 +156,16 @@
  1508.  
  1509.  
  1510. ####################
  1511. +# pocketcraftingactionkeys
  1512. +####################
  1513. +
  1514. +pocketcraftingactionkeys {
  1515. + # 4 keys for: removing (x), cycling (c), balancing (b), filling (f)
  1516. + S:client=xcbf
  1517. +}
  1518. +
  1519. +
  1520. +####################
  1521. # server
  1522. ####################
  1523.  
  1524. @@ -169,7 +188,7 @@
  1525. D:steamOutputAdjustment=1.0
  1526.  
  1527. # If true, maximum clay lump volume is 1 m³ instead of (1 m³)/4
  1528. - B:stretchyClay=false
  1529. + B:stretchyClay=true
  1530.  
  1531. # How many ticks the server will wait before sending out TPS reports. 20 ticks = 1 second.
  1532. I:tpsReportInterval=20
  1533. Only in Direwolf20_1_5-server-newbeta/config: flatsigns.cfg
  1534. diff -ur Direwolf20_1_5-server-1_1_2/config/forestry/backpacks.conf Direwolf20_1_5-server-newbeta/config/forestry/backpacks.conf
  1535. --- Direwolf20_1_5-server-1_1_2/config/forestry/backpacks.conf 2013-08-03 13:01:24.000000000 -0500
  1536. +++ Direwolf20_1_5-server-newbeta/config/forestry/backpacks.conf 2013-08-05 20:39:46.000000000 -0500
  1537. @@ -13,11 +13,11 @@
  1538. # BACKPACKS
  1539. #####################
  1540. # add additional blocks and items for the miner's backpack here in the format id:meta. separate blocks and items using ';'. wildcard for metadata: '*'
  1541. -backpacks.miner.items=
  1542. +backpacks.miner.items=4362:6;371;1488:1;2001:*;30128;25264:*
  1543. # add additional blocks and items for the digger's backpack here in the format id:meta. separate blocks and items using ';'. wildcard for metadata: '*'
  1544. backpacks.digger.items=
  1545. # add additional blocks and items for the forester's backpack here in the format id:meta. separate blocks and items using ';'. wildcard for metadata: '*'
  1546. -backpacks.forester.items=
  1547. +backpacks.forester.items=2403:1;3124;2404:1;
  1548. # add additional blocks and items for the hunter's backpack here in the format id:meta. separate blocks and items using ';'. wildcard for metadata: '*'
  1549. backpacks.hunter.items=
  1550. # add blocks and items for the adventurer's backpack here in the format id:meta. separate blocks and items using ';'. wildcard for metadata: '*'
  1551. diff -ur Direwolf20_1_5-server-1_1_2/config/forestry/base.conf Direwolf20_1_5-server-newbeta/config/forestry/base.conf
  1552. --- Direwolf20_1_5-server-1_1_2/config/forestry/base.conf 2013-08-03 13:01:24.000000000 -0500
  1553. +++ Direwolf20_1_5-server-newbeta/config/forestry/base.conf 2013-08-05 20:39:46.000000000 -0500
  1554. @@ -16,7 +16,7 @@
  1555. I:fences=1394
  1556. I:fences2=1418
  1557. I:leaves=1393
  1558. - I:lepidopterology=1376
  1559. + I:lepidopterology=1419
  1560. I:log1=1388
  1561. I:log2=1389
  1562. I:log3=1390
  1563. @@ -37,7 +37,7 @@
  1564. I:slabs2=1387
  1565. I:slabs3=1415
  1566. I:soil=1397
  1567. - I:stained=1381
  1568. + I:stained=1420
  1569. I:stairs=1396
  1570. I:stump=1379
  1571. }
  1572. diff -ur Direwolf20_1_5-server-1_1_2/config/forestry/common.conf Direwolf20_1_5-server-newbeta/config/forestry/common.conf
  1573. --- Direwolf20_1_5-server-1_1_2/config/forestry/common.conf 2013-08-03 13:01:08.000000000 -0500
  1574. +++ Direwolf20_1_5-server-newbeta/config/forestry/common.conf 2013-08-05 20:39:26.000000000 -0500
  1575. @@ -35,7 +35,7 @@
  1576. # GENETICS
  1577. #####################
  1578. # NEW: set to true to clear chromosomes which contain invalid alleles. might rescue your save if it is crashing after removal of a bee addon.
  1579. -genetics.clear.invalid.chromosomes=false
  1580. +genetics.clear.invalid.chromosomes=true
  1581.  
  1582.  
  1583. #####################
  1584. @@ -93,14 +93,21 @@
  1585. # set to true to disable access restrictions on forestry machines.
  1586. tweaks.permissions.disabled=false
  1587. # set to true to disable some nagging and warnings (e.g. GregTech).
  1588. -tweaks.nags.disabled=false
  1589. +tweaks.nags.disabled=true
  1590. # set to true to disable update and version check notice.
  1591. -tweaks.upgradenotice.disabled=false
  1592. +tweaks.upgradenotice.disabled=true
  1593. # set to true to have farms use a square layout instead of a diamond one.
  1594. tweaks.farms.squared=false
  1595.  
  1596.  
  1597. #####################
  1598. +# VARS
  1599. +#####################
  1600. +# ##################
  1601. +vars.version.seen=2.2.2.2
  1602. +
  1603. +
  1604. +#####################
  1605. # WORLD
  1606. #####################
  1607. # set to false to force forestry to skip generating own apatite ore blocks in the world
  1608. diff -ur Direwolf20_1_5-server-1_1_2/config/forestry/lepidopterology.conf Direwolf20_1_5-server-newbeta/config/forestry/lepidopterology.conf
  1609. --- Direwolf20_1_5-server-1_1_2/config/forestry/lepidopterology.conf 2013-08-03 13:01:24.000000000 -0500
  1610. +++ Direwolf20_1_5-server-newbeta/config/forestry/lepidopterology.conf 2013-08-05 20:39:46.000000000 -0500
  1611. @@ -15,4 +15,4 @@
  1612. # determines the global butterfly entity count above which natural spawning of butterflies ceases.
  1613. entities.spawn.limit=100
  1614. # determines the global butterfly entity count above which butterflies will stay in item form and will not take flight anymore.
  1615. -entities.maximum.allowed=1000
  1616. +entities.maximum.allowed=2000
  1617. diff -ur Direwolf20_1_5-server-1_1_2/config/forestry/pipes.conf Direwolf20_1_5-server-newbeta/config/forestry/pipes.conf
  1618. --- Direwolf20_1_5-server-1_1_2/config/forestry/pipes.conf 2013-08-03 13:01:08.000000000 -0500
  1619. +++ Direwolf20_1_5-server-newbeta/config/forestry/pipes.conf 2013-08-05 20:39:26.000000000 -0500
  1620. @@ -12,5 +12,5 @@
  1621. #####################
  1622. # PROPOLISPIPE
  1623. #####################
  1624. -# #
  1625. +# #########
  1626. propolisPipe=14000
  1627. Only in Direwolf20_1_5-server-newbeta/config: machinemuse
  1628. diff -ur Direwolf20_1_5-server-1_1_2/config/mmmPowersuits.cfg Direwolf20_1_5-server-newbeta/config/mmmPowersuits.cfg
  1629. --- Direwolf20_1_5-server-1_1_2/config/mmmPowersuits.cfg 2013-08-03 13:01:26.000000000 -0500
  1630. +++ Direwolf20_1_5-server-newbeta/config/mmmPowersuits.cfg 2013-08-05 20:39:48.000000000 -0500
  1631. @@ -38,7 +38,7 @@
  1632. D:"Maximum Armor per Piece"=6.0
  1633. D:"Maximum flight speed (in m/s)"=25.0
  1634. D:"Salvage Ratio"=0.9
  1635. - B:"Thermal Expansion Recipes"=false
  1636. + B:"Thermal Expansion Recipes"=true
  1637. B:"Universal Electricity Recipes"=false
  1638. B:"Use Graphical Meters"=true
  1639. B:"Use Mousewheel to change modes"=true
  1640. @@ -72,6 +72,20 @@
  1641.  
  1642.  
  1643. ####################
  1644. +# "modular powersuits addons"
  1645. +####################
  1646. +
  1647. +""modular powersuits addons"" {
  1648. + B:"Use Cheaty Leather Recipe (Requires Thermal Expansion)"=true
  1649. + B:"Use Debug mode. WARNING: WILL PROBABLY SPAM YOUR CONSOLE"=false
  1650. + B:"Use Detailed Ore Scanner Message"=true
  1651. + B:"Use HUD for certain modules (Auto Feeder, Torch Placer, Compass, Clock, etc."=true
  1652. + B:"Use Old Auto Feeder Method"=false
  1653. + B:"Use a 24h clock instead of 12h"=false
  1654. +}
  1655. +
  1656. +
  1657. +####################
  1658. # modules
  1659. ####################
  1660.  
  1661. @@ -81,32 +95,44 @@
  1662. B:"Apiarist Armor"=true
  1663. B:"Aqua Affinity"=true
  1664. B:Aurameter=true
  1665. + B:Auto-Feeder=true
  1666. B:Axe=true
  1667. B:"Basic Battery"=true
  1668. B:Binoculars=true
  1669. B:"Blade Launcher"=true
  1670. B:"Blink Drive"=true
  1671. + B:Clock=true
  1672. + B:Compass=true
  1673. B:"Cooling System"=true
  1674. B:"Custom Colour Module"=true
  1675. B:"Diamond Drill Upgrade"=true
  1676. B:"Diamond Plating"=true
  1677. + B:"EU Reader"=true
  1678. B:"Elite Battery"=true
  1679. B:"Energy Shield"=true
  1680. B:"Field Tinker Module"=true
  1681. B:"Flight Control"=true
  1682. + B:"Flint and Steel"=true
  1683. B:Glider=true
  1684. B:"Glow Module"=true
  1685. B:Grafter=true
  1686. B:"Heat Sink"=true
  1687. + B:"In-Place Assembler"=true
  1688. B:"Iron Plating"=true
  1689. B:"Jet Boots"=true
  1690. B:Jetpack=true
  1691. B:"Jump Assist"=true
  1692. + B:"Kinetic Generator"=true
  1693. + B:"Leaf Blower"=true
  1694. + B:"Lightning Summoner"=true
  1695. B:"Lux Capacitor"=true
  1696. B:"MFFS Field Teleporter"=true
  1697. + B:Magnet=true
  1698. B:"Melee Assist"=true
  1699. + B:"Mob Repulsor"=true
  1700. B:Multimeter=true
  1701. B:"Night Vision"=true
  1702. + B:"Ore Scanner"=true
  1703. B:Parachute=true
  1704. B:Pickaxe=true
  1705. B:"Plasma Cannon"=true
  1706. @@ -116,11 +142,17 @@
  1707. B:Shears=true
  1708. B:"Shock Absorber"=true
  1709. B:Shovel=true
  1710. + B:"Solar Generator"=true
  1711. B:"Sprint Assist"=true
  1712. B:"Swim Boost"=true
  1713. + B:"TE Multimeter"=true
  1714. + B:"Thermal Generator"=true
  1715. + B:"Torch Placer"=true
  1716. B:"Transparent Armor"=true
  1717. + B:Treetap=true
  1718. B:"Uphill Step Assist"=true
  1719. B:"Water Electrolyzer"=true
  1720. + B:"Water Tank"=true
  1721. }
  1722.  
  1723.  
  1724. @@ -140,6 +172,10 @@
  1725. D:"Aqua Affinity.Underwater Energy Consumption.base"=0.0
  1726. D:"Aqua Affinity.Underwater Harvest Speed.Power.multiplier"=0.8
  1727. D:"Aqua Affinity.Underwater Harvest Speed.base"=0.2
  1728. + D:"Auto-Feeder.Auto-Feeder Efficiency.Efficiency.multiplier"=50.0
  1729. + D:"Auto-Feeder.Auto-Feeder Efficiency.base"=50.0
  1730. + D:"Auto-Feeder.Eating Energy Consumption.Efficiency.multiplier"=100.0
  1731. + D:"Auto-Feeder.Eating Energy Consumption.base"=100.0
  1732. D:"Axe.Axe Energy Consumption.Overclock.multiplier"=950.0
  1733. D:"Axe.Axe Energy Consumption.Radius.multiplier"=1000.0
  1734. D:"Axe.Axe Energy Consumption.base"=50.0
  1735. @@ -176,6 +212,7 @@
  1736. D:"Energy Shield.Armor (Energy).Field Strength.multiplier"=6.0
  1737. D:"Energy Shield.Energy Per Damage.Field Strength.multiplier"=500.0
  1738. D:"Flight Control.Y-look ratio.Verticality.multiplier"=1.0
  1739. + D:"Flint and Steel.Ignition Energy Consumption.base"=1000.0
  1740. D:"Glow Module.Blue Glow.Blue Glow.multiplier"=1.0
  1741. D:"Glow Module.Green Glow.Green Glow.multiplier"=1.0
  1742. D:"Glow Module.Red Glow.Red Glow.multiplier"=1.0
  1743. @@ -200,14 +237,32 @@
  1744. D:"Jump Assist.Jump Energy Consumption.base"=0.0
  1745. D:"Jump Assist.Jump Exhaustion Compensation.Compensation.multiplier"=1.0
  1746. D:"Jump Assist.Jump Exhaustion Compensation.base"=0.0
  1747. + D:"Kinetic Generator.Energy Per 5 Blocks.Energy Generated.multiplier"=600.0
  1748. + D:"Kinetic Generator.Energy Per 5 Blocks.base"=200.0
  1749. + D:"Kinetic Generator.Heat Generation.base"=5.0
  1750. + D:"Kinetic Generator.Weight.Energy Generated.multiplier"=3000.0
  1751. + D:"Kinetic Generator.Weight.base"=1000.0
  1752. + D:"Leaf Blower.Energy Consumption.base"=100.0
  1753. + D:"Leaf Blower.Leaf Radius.base"=1.0
  1754. + D:"Leaf Blower.Plant Radius.base"=1.0
  1755. + D:"Lightning Summoner.Lightning Energy Consumption.base"=500000.0
  1756. + D:"Lightning Summoner.Lightning Heat Emission.base"=100.0
  1757. D:"Lux Capacitor.Lux Capacitor Energy Consumption.base"=100.0
  1758. D:"MFFS Field Teleporter.Field Teleporter Energy Consumption.base"=20000.0
  1759. + D:"Magnet.Energy Consumption.base"=200.0
  1760. + D:Magnet.Weight.base=1000.0
  1761. D:"Melee Assist.Melee Damage.Impact.multiplier"=8.0
  1762. D:"Melee Assist.Melee Damage.base"=2.0
  1763. D:"Melee Assist.Melee Knockback.Carry-through.multiplier"=1.0
  1764. D:"Melee Assist.Punch Energy Consumption.Carry-through.multiplier"=20.0
  1765. D:"Melee Assist.Punch Energy Consumption.Impact.multiplier"=100.0
  1766. D:"Melee Assist.Punch Energy Consumption.base"=10.0
  1767. + D:"Mob Repulsor.Repulsor Energy Consumption.base"=250.0
  1768. + D:"Mob Repulsor.Weight.base"=2000.0
  1769. + D:"Ore Scanner.Energy Per Block.base"=50.0
  1770. + D:"Ore Scanner.X Radius.base"=1.0
  1771. + D:"Ore Scanner.Y Radius.base"=1.0
  1772. + D:"Ore Scanner.Z Radius.base"=1.0
  1773. D:"Pickaxe.Pickaxe Energy Consumption.Overclock.multiplier"=950.0
  1774. D:"Pickaxe.Pickaxe Energy Consumption.base"=50.0
  1775. D:"Pickaxe.Pickaxe Harvest Speed.Overclock.multiplier"=22.0
  1776. @@ -239,6 +294,8 @@
  1777. D:"Shovel.Shovel Energy Consumption.base"=50.0
  1778. D:"Shovel.Shovel Harvest Speed.Overclock.multiplier"=22.0
  1779. D:"Shovel.Shovel Harvest Speed.base"=8.0
  1780. + D:"Solar Generator.Daytime Energy Generation.base"=1500.0
  1781. + D:"Solar Generator.Nighttime Energy Generation.base"=150.0
  1782. D:"Sprint Assist.Sprint Energy Consumption.Compensation.multiplier"=2.0
  1783. D:"Sprint Assist.Sprint Energy Consumption.Power.multiplier"=10.0
  1784. D:"Sprint Assist.Sprint Energy Consumption.base"=0.0
  1785. @@ -252,7 +309,20 @@
  1786. D:"Sprint Assist.Walking Speed Multiplier.base"=1.0
  1787. D:"Swim Boost.Swim Boost Energy Consumption.Thrust.multiplier"=100.0
  1788. D:"Swim Boost.Underwater Movement Boost.Thrust.multiplier"=1.0
  1789. + D:"Thermal Generator.Energy Generation.Energy Generated.multiplier"=25.0
  1790. + D:"Thermal Generator.Energy Generation.base"=25.0
  1791. + D:"Thermal Generator.Weight.Energy Generated.multiplier"=1000.0
  1792. + D:"Thermal Generator.Weight.base"=1000.0
  1793. + D:"Torch Placer.Energy Consumption.Storage.multiplier"=450.0
  1794. + D:"Torch Placer.Energy Consumption.base"=50.0
  1795. + D:"Torch Placer.Maximum Storage Amount.Storage.multiplier"=192.0
  1796. + D:"Torch Placer.Maximum Storage Amount.base"=64.0
  1797. + D:"Treetap.Energy Consumption.base"=100.0
  1798. D:"Water Electrolyzer.Jolt Energy.base"=1000.0
  1799. + D:"Water Tank.Tank Size.Tank Size.multiplier"=800.0
  1800. + D:"Water Tank.Tank Size.base"=200.0
  1801. + D:"Water Tank.Weight.Tank Size.multiplier"=4000.0
  1802. + D:"Water Tank.Weight.base"=1000.0
  1803. }
  1804.  
  1805.  
  1806. Only in Direwolf20_1_5-server-newbeta/config: mod_BackTools.cfg
  1807. Only in Direwolf20_1_5-server-newbeta/config: mod_BackTools.dat
  1808. diff -ur Direwolf20_1_5-server-1_1_2/config/mystcraft/symbols.cfg Direwolf20_1_5-server-newbeta/config/mystcraft/symbols.cfg
  1809. --- Direwolf20_1_5-server-1_1_2/config/mystcraft/symbols.cfg 2013-07-30 19:06:20.000000000 -0500
  1810. +++ Direwolf20_1_5-server-newbeta/config/mystcraft/symbols.cfg 2013-08-03 14:50:24.000000000 -0500
  1811. @@ -114,7 +114,12 @@
  1812. B:biome253.enabled=true
  1813. B:biome254.enabled=true
  1814. B:biome3.enabled=true
  1815. + B:biome39.enabled=true
  1816. B:biome4.enabled=true
  1817. + B:biome40.enabled=true
  1818. + B:biome41.enabled=true
  1819. + B:biome42.enabled=true
  1820. + B:biome43.enabled=true
  1821. B:biome44.enabled=true
  1822. B:biome45.enabled=true
  1823. B:biome46.enabled=true
  1824. Only in Direwolf20_1_5-server-newbeta/config: mystcraft_config.txt
  1825. Only in Direwolf20_1_5-server-newbeta/config: net
  1826. diff -ur Direwolf20_1_5-server-1_1_2/config/powercrystals/core/client.cfg Direwolf20_1_5-server-newbeta/config/powercrystals/core/client.cfg
  1827. --- Direwolf20_1_5-server-1_1_2/config/powercrystals/core/client.cfg 2013-08-03 13:01:02.000000000 -0500
  1828. +++ Direwolf20_1_5-server-newbeta/config/powercrystals/core/client.cfg 2013-08-05 20:39:20.000000000 -0500
  1829. @@ -6,7 +6,7 @@
  1830.  
  1831. general {
  1832. # Set to false to disable update checks for all Power Crystals' mods.
  1833. - B:EnableUpdateCheck=true
  1834. + B:EnableUpdateCheck=false
  1835. }
  1836.  
  1837.  
  1838. Only in Direwolf20_1_5-server-newbeta/config/powercrystals: netherores
  1839. Only in Direwolf20_1_5-server-newbeta/config/powercrystals: powerconverters
  1840. Only in Direwolf20_1_5-server-1_1_2/config: powersuits-keybinds.cfg
  1841. diff -ur Direwolf20_1_5-server-1_1_2/config/railcraft/modules.cfg Direwolf20_1_5-server-newbeta/config/railcraft/modules.cfg
  1842. --- Direwolf20_1_5-server-1_1_2/config/railcraft/modules.cfg 2013-07-30 19:06:20.000000000 -0500
  1843. +++ Direwolf20_1_5-server-newbeta/config/railcraft/modules.cfg 2013-08-01 04:51:08.000000000 -0500
  1844. @@ -12,6 +12,7 @@
  1845. modules {
  1846. B:automation=true
  1847. B:chunk.loading=true
  1848. + B:energy=true
  1849. B:extras=true
  1850. B:factory=true
  1851. B:forestry=true
  1852. diff -ur Direwolf20_1_5-server-1_1_2/config/railcraft/railcraft.cfg Direwolf20_1_5-server-newbeta/config/railcraft/railcraft.cfg
  1853. --- Direwolf20_1_5-server-1_1_2/config/railcraft/railcraft.cfg 2013-08-03 13:01:14.000000000 -0500
  1854. +++ Direwolf20_1_5-server-newbeta/config/railcraft/railcraft.cfg 2013-08-05 20:39:32.000000000 -0500
  1855. @@ -8,7 +8,7 @@
  1856. #
  1857. # change to craftable=false to disable World Anchor crafting, they will still be available via Creative
  1858. #
  1859. - B:craftable=true
  1860. + B:craftable=false
  1861.  
  1862. #
  1863. # change to 'delete.anchors=true' to delete every World Anchor or Anchor Cart in the world.
  1864. @@ -73,7 +73,7 @@
  1865. I:block.detector=450
  1866. I:block.elevator=455
  1867. I:block.glass=474
  1868. - I:block.hidden=473
  1869. + I:block.hidden=0
  1870. I:block.machine.alpha=451
  1871. I:block.machine.beta=452
  1872. I:block.machine.gamma=453
  1873. @@ -124,7 +124,7 @@
  1874. #
  1875. # change to 'check.version.online=false' to disable latest version checking
  1876. #
  1877. - B:check.version.online=true
  1878. + B:check.version.online=false
  1879.  
  1880. #
  1881. # change to 'play.sounds=false' to prevent all mod sounds from playing
  1882. @@ -367,12 +367,12 @@
  1883. #
  1884. # change to 'blaze=false' to disable the IC2 Macerator recipe for Blaze Powder
  1885. #
  1886. - B:blaze=true
  1887. + B:blaze=false
  1888.  
  1889. #
  1890. # change to 'bones=false' to disable the IC2 Macerator recipe for Bonemeal
  1891. #
  1892. - B:bones=true
  1893. + B:bones=false
  1894.  
  1895. #
  1896. # change to 'charcoal=false' to disable the IC2 Macerator recipe for Charcoal Dust
  1897. @@ -474,6 +474,7 @@
  1898. B:machine.alpha.dispenser.cart=true
  1899. B:machine.alpha.dispenser.train=true
  1900. B:machine.alpha.feed.station=true
  1901. + B:machine.alpha.loader.energy=true
  1902. B:machine.alpha.rock.crusher=true
  1903. B:machine.alpha.rolling.machine=true
  1904. B:machine.alpha.smoker=true
  1905. @@ -482,6 +483,7 @@
  1906. B:machine.alpha.steam.trap.auto=true
  1907. B:machine.alpha.tank.water=true
  1908. B:machine.alpha.turbine=true
  1909. + B:machine.alpha.unloader.energy=true
  1910. B:machine.beta.anchor.sentinel=true
  1911. B:machine.beta.boiler.firebox.liquid=true
  1912. B:machine.beta.boiler.firebox.solid=true
  1913. @@ -896,6 +898,15 @@
  1914. B:sulfur=true
  1915. }
  1916.  
  1917. + ####################
  1918. + # biomes
  1919. + ####################
  1920. +
  1921. + biomes {
  1922. + S:quarried=
  1923. + S:sulfur=
  1924. + }
  1925. +
  1926. }
  1927.  
  1928.  
  1929. Only in Direwolf20_1_5-server-newbeta/config/thaumcraft_localization: de_DE.lang
  1930. Only in Direwolf20_1_5-server-newbeta/config/thaumcraft_localization: en_US.lang
  1931. Only in Direwolf20_1_5-server-newbeta/config: xreliquary.cfg
  1932. Only in Direwolf20_1_5-server-1_1_2/mods: AppliedEnergistics-rv11.e.zip
  1933. Binary files Direwolf20_1_5-server-1_1_2/mods/Biomes-O-Plenty-0.5.9.2-1.5.2.jar.disabled and Direwolf20_1_5-server-newbeta/mods/Biomes-O-Plenty-0.5.9.2-1.5.2.jar.disabled differ
  1934. Only in Direwolf20_1_5-server-newbeta/mods: ForgeMultipart-universal-1.5.2-1.0.0.114.jar
  1935. Only in Direwolf20_1_5-server-1_1_2/mods: ForgeMultipart-universal-1.5.2-1.0.0.60.jar
  1936. Only in Direwolf20_1_5-server-1_1_2/mods: LogisticsPipes-MC1.5.2-0.7.3.dev.622.jar
  1937. Only in Direwolf20_1_5-server-newbeta/mods: LogisticsPipes-MC1.5.2-0.7.3.ftb.631.jar
  1938. Only in Direwolf20_1_5-server-newbeta/mods: Natura_1.5.1_2.1.4.jar
  1939. Only in Direwolf20_1_5-server-1_1_2/mods: Natura_2.1.4.jar
  1940. Only in Direwolf20_1_5-server-newbeta/mods: TConstruct_1.5.2_1.4.2.1.jar
  1941. Only in Direwolf20_1_5-server-1_1_2/mods: TConstruct_1.5.2_1.4.2.jar
  1942. Only in Direwolf20_1_5-server-newbeta/mods: VoxelMods
  1943. Only in Direwolf20_1_5-server-newbeta/mods: appeng-rv12-a-mc15x.zip
  1944. Only in Direwolf20_1_5-server-newbeta/mods: miscperipherals-3.3e.jar
  1945. Only in Direwolf20_1_5-server-1_1_2/mods: miscperipherals-3.3f.jar
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!