Merge pull request #169 from TPPI-Dev/Dev

Merge Dev

config/AdvancedSolarPanel_MTRecipes.cfg

@@ -22,8 +22,6 @@ ID:35-14;ID:152;1;1;1000000 # red wool -> Block.blockRedstone
 ID:351-4;OD:gemSapphire;1;1;5000000 # lapis lazuli -> sapphire
 ID:331;OD:gemRuby;1;1;5000000 # Item.redstone -> ruby
 ID:263;OD:craftingIndustrialDiamond;1;1;9000000 # coal -> industrial diamond
-OD:dustTitanium;OD:dustChrome;1;1;500000
-OD:ingotTitanium;OD:ingotChrome;1;1;500000
 OD:gemNetherQuartz;OD:gemCertusQuartz;1;1;1000000
 OD:ingotCopper;OD:ingotNickel;1;1;300000
 OD:ingotTin;OD:ingotSilver;1;1;1000000

config/AppliedEnergistics.cfg

@@ -115,7 +115,7 @@ features {
 ####################
 
 graphics {
-    B:gfxCableAnimation=true
+    B:gfxCableAnimation=false
     I:gfxCableMinTickRate=22
     B:gfxDrivesHighDef=true
 }
@@ -214,7 +214,7 @@ me {
         D:powerUsageMultiplier=1.0
         D:powerWirelessDistanceMultiplier=10.0
         B:requirePower=true
-        B:sharePowerLPRS485=true
+        B:sharePowerLPRS485=false
         I:storageBusMinTickRate=5
         S:terminalAutoSearch=Autosearch
         B:terminalSearchToolTips=true

config/DartCraft/wrenchables.txt

@@ -7,7 +7,7 @@ net.minecraft.tileentity.TileEntityFurnace
 net.minecraft.tileentity.TileEntityBeacon
 net.minecraft.tileentity.TileEntityDispenser
 net.minecraft.tileentity.TileEntityDropper
-net.minecraft.tileentity.TileEntityMobSpawner
+#net.minecraft.tileentity.TileEntityMobSpawner
 net.minecraft.tileentity.TileEntityNote
 net.minecraft.tileentity.TileEntityRecordPlayer
 

config/GregTech/DynamicConfig.cfg

@@ -2010,7 +2010,7 @@ blastfurnacerequirements {
     B:steel_true=true
     B:terbium_true=true
     B:thulium_true=true
-    B:titanium_true=true
+    B:titanium_true=false
     B:tungstate_true=true
     B:tungsten_true=true
     B:tungstensteel_true=true
@@ -3150,7 +3150,7 @@ centrifuge {
     I:dustTungstenSteel_1904=1904
     I:dustWroughtIron_448=448
     I:ic2.itemHarz_1300=1300
-    I:item.appleGold_10000=10000
+    I:item.appleGold_10000=0
     I:item.apple_5000=5000
     I:item.beefCooked_5000=5000
     I:item.beefRaw_5000=5000

config/LogisticsPipes.cfg

@@ -35,7 +35,7 @@ general {
     I:HUDRenderDistance=15
 
     # Should LogisticsPipes check for updates?
-    B:checkForUpdates=true
+    B:checkForUpdates=false
 
     # The maximum number of buildcraft pipes (including forks) between logistics pipes. This is an indicator of the maximum amount of nodes the recursion algorithm will visit before giving up. As it is possible to fork a pipe connection using standard BC pipes the algorithm will attempt to discover all available destinations through that pipe. Do note that the logistics system will not interfere with the operation of non-logistics pipes. So a forked pipe will usually be sup-optimal, but it is possible. A low value might reduce CPU usage, a high value will be able to handle more complex pipe setups. If you never fork your connection between the logistics pipes this has the same meaning as detectionLength and the lower of the two will be used
     I:detectionCount=100

config/Mekanism.cfg

@@ -35,21 +35,21 @@ general {
     B:DynamicTankEasterEgg=false
     D:EUToJoules=0.1
     B:EnableSounds=true
-    I:EnergyPerRedstone=10000
+    D:EnergyPerRedstone=10000.0
     S:EnergyType=RF
     B:FancyUniversalCableRender=true
     B:ForceBuildcraftPower=true
     B:Holidays=true
-    I:JoulesToEU=11
-    I:JoulesToMJ=28
+    D:JoulesToEU=10.0
+    D:JoulesToMJ=25.0
     B:LogPackets=false
     D:MJToJoules=0.04
     I:ObsidianTNTBlastRadius=12
     I:ObsidianTNTDelay=100
     I:OsmiumGenerationAmount=8
     B:OsmiumGenerationEnabled=false
     B:OverrideUERatios=true
-    I:SoundVolume=1
+    D:SoundVolume=1.0
     I:TinGenerationAmount=0
     B:TinGenerationEnabled=false
     B:UpdateNotifications=true
@@ -64,12 +64,12 @@ general {
 ####################
 
 generation {
-    I:AdvancedSolarGeneration=40
-    I:BioGeneration=100
-    I:HeatGeneration=5
-    I:HydrogenGeneration=200
-    I:SolarGeneration=10
-    I:WindGeneration=18
+    D:AdvancedSolarGeneration=40.0
+    D:BioGeneration=100.0
+    D:HeatGeneration=5.0
+    D:HydrogenGeneration=200.0
+    D:SolarGeneration=10.0
+    D:WindGeneration=18.0
 }
 
 
@@ -78,6 +78,7 @@ generation {
 ####################
 
 item {
+	I:ArmoredJetpack=10896
     I:AtomicCore=10794
     I:AtomicDisassembler=10795
     I:Balloon=10885
@@ -128,19 +129,19 @@ usage {
     D:ChemicalInfuserUsage=250.0
     D:ChemicalInjectionChamberUsage=550.0
     D:ChemicalWasherUsage=250.0
-    I:CombinerUsage=75
-    I:CrusherUsage=30
-    I:DigitalMinerUsage=500
-    I:ElectrolyticSeparatorUsage=65
-    I:EnergizedSmelterUsage=18
-    I:EnrichmentChamberUsage=45
-    I:FactoryUsage=185
-    I:MetallurgicInfuserUsage=60
-    I:OsmiumCompressorUsage=75
+    D:CombinerUsage=75.0
+    D:CrusherUsage=30.0
+    D:DigitalMinerUsage=500.0
+    D:ElectrolyticSeparatorUsage=65.0
+    D:EnergizedSmelterUsage=18.0
+    D:EnrichmentChamberUsage=45.0
+    D:FactoryUsage=185.0
+    D:MetallurgicInfuserUsage=60.0
+    D:OsmiumCompressorUsage=100.0
     D:OxidationChamberUsage=220.0
     D:PrecisionSawmillUsage=9.0
-    I:PurificationChamberUsage=140
-    I:RotaryCondensentratorUsage=100
+    D:PurificationChamberUsage=200.0
+    D:RotaryCondensentratorUsage=100.0
 }
 
 

config/Morph.cfg

@@ -149,7 +149,7 @@ gameplay {
     # 0 = Enable early game flight
     # 1 = ...has reached the nether
     # 2 = ...has killed the Wither
-    I:disableEarlyGameFlight=1
+    I:disableEarlyGameFlight=2
 
     # Force the mod to use the local copy of the ModMobAbilitySupport?
     # This is meant for debugging purposes and for modified local mod mob abilities mappings.
@@ -170,7 +170,7 @@ gameplay {
     # 3 = Hostile mobs of the same type do not attack you but hostile mobs of other types attack you.
     # 4 = Hostile mobs have a decreased detection range around you.
     # If you'd like to turn on Hostile Ability, I'd recommend Mode 2 (personal preference)
-    I:hostileAbilityMode=0
+    I:hostileAbilityMode=3
 
     # Will you insta-morph into a new morph acquired?
     # 0 = No

config/Reika/LegacyCraft.cfg

@@ -24,7 +24,7 @@ control {
     B:"Disable Zombie Reinforcements"=true
     B:"Enforced Mob Controls"=true
     B:"Golden Apple Level 0 Uses Nuggets"=false
-    B:"Mobs Pick Up Drops"=true
+    B:"Mobs Pick Up Drops"=false
     B:"New Angry Enderman Sounds"=true
     B:"New Mob AI"=true
     B:"Old Bonemeal Mechanics"=false

config/TPPI/TPPITweaks.cfg

@@ -43,6 +43,9 @@
     # Lapis dust can be made from lapis using GregTech's mortars.
     B:addLapisDustMortarRecipes=true
 
+    # Charcoal blocks can be compressed to coal via compressor.
+    B:doCharcoalBlockCompression=true
+
     # Re-adds the old GregTech centrifuge recipe for platinum dust to iridium nugget + small nickel dust.
     B:doPlatinumInCentrifuge=true
 
@@ -108,6 +111,7 @@ item {
     B:change_MPSA_recipes=true
 }
 
+
 ####################
 # other mod tweaks
 ####################
@@ -116,12 +120,18 @@ item {
     # Add recipe for Ars Magica 2 Nature Guardian spawn egg. Useful when dryads are disabled.
     B:addAM2NatureGuardianRecipe=true
 
+    # Add a recipe for the essence seeds in magical crops
+    B:addEssenceSeedRecipe=true
+
     # Add a recipe for impure osmium dust to clean osmium dust in the IC2 ore washer.
     B:addOsmiumToOreWasher=true
 
     # Remove the recipe for the cardboard box (it can move ANY tile entity including nodes and spanwers)
     B:disableCardboardBox=true
 
+    # Remove the force shears recipe because they were crashing servers rarely, but in a serious way. Disable this at your own risk.
+    B:disableForceShears=true
+
     # OpenBlocks block breakers and placers have the same recipes as Redpower 2's.
     B:eloraamBreakersAndDeployers=true
 
@@ -131,9 +141,15 @@ item {
     # Big Reactors fuel rods take just a touch of reactor glass.
     B:glassFuelRods=true
 
+    # Make the autonomous activator recipe slightly harder
+    B:harderActivatorRecipe=true
+
     # Makes the recipe for the Atomic Disassembler much more difficult
     B:harderAtomicDisassembler=true
 
+    # Make the lillipad of fertility much harder to craft
+    B:harderLillipadOfFertility=true
+
     # IC2 reinforced glass (glassReinforced) and Thermal Expansion hardened glass (glassHardened)
     # will be cross-registered as each other in the ore dictionary.
     B:ic2TEGlassInterchangeability=true
@@ -155,6 +171,22 @@ item {
 }
 
 
+####################
+# pack info
+####################
+
+"pack info" {
+    # The acronym of the pack (required, can be the same as name)
+    S:packAcronym=TPPI
+
+    # The full name of the pack
+    S:packName=Test Pack Please Ignore
+
+    # The version of the pack
+    S:packVerison=0.2.2
+}
+
+
 ####################
 # tppi guide info
 ####################

config/TPPI/changelog.txt

@@ -1,3 +1,65 @@
+TPPIv0.2.2:~
+- Updated EnderIO to 0.8.0.215 Added advanced fluid conduit. Fixes some bugs including a crash with TE conduits.~
+~
+- Updated Mekanism to 6.0.0.242. Fixes some bugs.~
+~
+- Updated TPPItweaks to v0.8.3. Added removebooks command.~
+~~~
+- Should have fixed most fluid registry issues.~
+~
+- Added ruby->ruby dust recipe in the pulverizer.~
+~
+- Added woodchip->paper recipe.~
+~~~
+- Morph flight needs a wither kill again. Gave some uses to other morphs: hostile mobs of the same type do not attack you.~
+~
+- Removed the silly exploit with experience crops by removing the crops. Will be re-added 0.3.0.~
+~~~
+- Added charcoal block->1 coal compression recipe.~
+~
+- Removed second seed drop from magical crops. Added essence seed recipe.~
+~
+- Remove Digital Miner recipe (TEMPORARY)
+~~~
+- Removed the conversion loss with universal cables. Fixes unlimited power issue and IC2 machines exploding.~
+~
+- LP and AE no longer share power, because, well, LP does not use power.~
+~~~
+- Removed Nikolite from the nether. RP2 is officially dead. I am sorry for your loss.~
+~
+- Slightly reduced certus quartz generation rate.~
+~
+- Changed recipe for the lilypad of fertility.~
+~~~
+- Recipe for the autonomous activator now takes steel.~
+~
+- Mobs will no longer pick up dropped items. This prevents the long standing duping issue.~
+~~~
+- Re-added Rutile (titanium) to the worldgen from mariculture. Removed IBF requirement for smelting titanium dust, as titanium is no longer a limiting factor in GT recipes, because of the stainless steel introduction.~
+~~~
+- Removed titanium->chrome recipe in the molecular transformer.~
+~
+- Fixed yellorite recipe in the SAGmill~
+~~~
+- Added some recipes to the Mekanism enrichment chamber.~
+~
+- NOTE: the issue of balance with magical crops is being heavily addressed in 0.3.0 with the new release of the mod. These solutions are temporary. Remember: This is only a beta.~
+~~~
+TPPIv0.2.1:~
+- Updated Dimensional Anchors to 57.1.93~
+~
+- Added DragoAPI V15b (for LegacyCraft)~
+~
+- Downgraded gregtech to 4.07o. Fixes NEI strangeness and long startup time.~
+~~~
+- Downgraded immibis microblocks to 57.5.0. Fixes rare crash bug (temporary)~
+~
+- Added LegacyCraft V15. Fixes zombie lag.~
+~
+- Updated Mekanism (and Generators) to build 226. Fixes various bugs.~
+~
+- Update TPPITweaks to 0.8.1-41. Fixes GUI startup bug. Cheapen Atomic Disassembler recipe. Add message on /tppi download when all mods are installed.~
+~~~
 TPPIv0.2.0:~
 - Added ArmorStatusHUD and bspkrsCore~
 ~

config/cofh/CoFHWorld-Generation.cfg

@@ -387,13 +387,13 @@ world {
         ####################
         # aecertus
         #===================
-        # <UNIFORM> Generation settings for AeCertus; Defaults: ClusterSize = 9, NumClusters = 4, MinY = 36, MaxY = 54
+        # <UNIFORM> Generation settings for AeCertus; Defaults: ClusterSize = 8, NumClusters = 4, MinY = 36, MaxY = 54
         ####################
 
         aecertus {
             I:BlockId=854
             I:BlockMeta=0
-            I:ClusterSize=9
+            I:ClusterSize=8
             I:MaxY=54
             I:MinY=36
             I:NumClusters=4

config/cofh/WorldCustomGen.txt

@@ -23,5 +23,5 @@ UNIFORM	teNickel	2001	4	4	5	5	20	false
 NORMAL	mekOsmium	2450	0	8	8	16	14	false
 NORMAL	magicalCropsOre	3636	0	8	3	13	5	false
 UNIFORM	brYellorite	2148	0	14	2	1	9	false
-UNIFORM	aeCertus	854	0	9	4	36	54	false
+UNIFORM	aeCertus	854	0	8	4	36	54	false
 UNIFORM	ticAluminum	1475	5	4	11	44	62	false

config/enderio/EnderIO.cfg

@@ -56,13 +56,24 @@ item {
 ####################
 
 settings {
+	# Number of millibuckects per tick extract by advanced fluid conduits auto extract..
+    I:advancedFluidConduitExtractRate=100
+
+    # Number of millibuckects per tick that can pass through a single connection to an advanced fluid conduit.
+    I:advancedFluidConduitMaxIoRate=400
+
     # Valid values are between 0-1, smallest conduits at 0, largest at 1.
     # In SMP, all clients must be using the same value as the server.
     D:conduitScale=0.2
-    B:detailedPowerTrackingEnabled=true
 
     # If true, all power is displayed in RF, otherwise MJ is used.
     B:displayPowerAsRedstoneFlux=true
+
+    # Number of millibuckects per tick extract by a fluid conduits auto extract..
+    I:fluidConduitExtractRate=50
+
+    # Number of millibuckects per tick that can pass through a single connection to a fluid conduit.
+    I:fluidConduitMaxIoRate=200
 
     # If true, 'line of sight' distance rather than conduit path distance is used to calculate priorities.
     B:itemConduitUsePhyscialDistance=false

config/enderio/SAGMillRecipes_User.xml

@@ -56,8 +56,10 @@ found in the core file.
     </recipe>
 </recipeGroup>
 -->
-  
+
 <SAGMillRecipes>
+
+    <recipeGroup name="BigReactors" enabled="false"/> 
 
     <recipeGroup name="Mekanism" >
 
@@ -155,14 +157,14 @@ found in the core file.
     </recipe>
 </recipeGroup>
 
-<recipeGroup name="BigReactors">
+<recipeGroup name="BigReactors2">
 <!-- Metals -->
        <recipe name="YelloriteOre" energyCost="360">
          <input>
              <itemStack oreDictionary="oreYellorite" />
          </input>
          <output>
-             <itemStack oreDictionary="dustYellorite" number="2" />
+             <itemStack oreDictionary="dustYellorium" number="2" />
              <itemStack oreDictionary="dustCyanite" number="1"
                         chance="0.05" />
          </output>