Merge pull request #257 from TPPI-Dev/Dev

Merge 1.0.2pre

ModVersions.txt

@@ -22,7 +22,7 @@ BuildCraft v4.2.2
 BuildCraft Colour Router Addon v0.3.4
 Calclavia Core v1.2.0.312
 Carpenter's Blocks v2.0.8
-Chisel v1.6.0.3
+Chisel v1.5.1 (Big thanks to asie)
 Code Chicken Core v0.9.0.9
 Code Chicken Lib v1.0.0.62
 COFH Core v2.0.0.2
@@ -31,7 +31,7 @@ Damage Indicators v2.9.2.3
 DartCraft v0.2.17
 DenLib v3.2.6
 Dimensional Anchors v57.1.95
-ElectroMagicTools v1.0.8
+ElectroMagicTools v1.0.9
 Emashers Resource v1.2.3.4  (lol)
 EnderIO v0.11.3.331
 Ender Prospecting v1.0.1.6
@@ -103,13 +103,13 @@ SortFix v1.0
 Steve's Carts 2.0.0b10
 Steve's Factory Manager vA78
 Thaumcraft v4.1.0g
-Thaumic Reliquary v1.0.2
+Thaumic Reliquary v1.1.1
 Thaumic Tinkerer v2.3-137
 Thaumic Tinkerer KAMI vJ6
 Thermal Expansion v3.0.0.2
 Tinker's Construct v1.6.4-513
 Tinker's Mechworks v1.6.4-19
-TPPITweaks v0.9.0
+TPPITweaks v1.0.0-10
 Translocators v1.1.0.15
 Twilight Forest v1.20.3
 Universal Electricity Core v3.1.0.74

config/Botania.cfg

@@ -47,7 +47,7 @@ general {
 
     # Set to true to use a static wand beam that shows every single position of the burst, similar to the way it used to work on old botania versions. Warning: Disabled by default because it may be laggy.
     B:wandBeam.static=false
-    I:worldgen.flower.density=18
+    I:worldgen.flower.density=10
     I:worldgen.flower.quantity=2
 }
 

config/Chisel.cfg

@@ -0,0 +1,153 @@
+# Configuration file
+
+####################
+# block
+####################
+
+block {
+    I:blockDiamond=2730
+    I:blockEmerald=2731
+    I:blockGold=2732
+    I:blockIron=2733
+    I:blockLapis=2734
+    I:blockLimestone=2735
+    I:blockLimestoneSlab.bottom=2736
+    I:blockLimestoneSlab.top=2737
+    I:blockLimestoneStairs.0=2738
+    I:blockLimestoneStairs.1=2739
+    I:blockLimestoneStairs.2=2740
+    I:blockLimestoneStairs.3=2741
+    I:blockLimestoneStairs.4=2742
+    I:blockLimestoneStairs.5=2743
+    I:blockLimestoneStairs.6=2744
+    I:blockLimestoneStairs.7=2745
+    I:blockMarble=2746
+    I:blockMarblePillar=2747
+    I:blockMarblePillarSlab.bottom=2748
+    I:blockMarblePillarSlab.top=2749
+    I:blockMarbleSlab.bottom=2750
+    I:blockMarbleSlab.top=2751
+    I:blockMarbleStairs.0=2752
+    I:blockMarbleStairs.1=2753
+    I:blockMarbleStairs.2=2754
+    I:blockMarbleStairs.3=2755
+    I:blockMarbleStairs.4=2756
+    I:blockMarbleStairs.5=2757
+    I:blockMarbleStairs.6=2758
+    I:blockMarbleStairs.7=2759
+    I:blockRedstone=2760
+    I:bookshelf=2761
+    I:carpet=2762
+    I:carpetFloor=2763
+    I:cloud=2764
+    I:concrete=2765
+    I:dirt=2766
+    I:factory=2767
+    I:fenceIron=2768
+    I:fft=2769
+    I:glass=2804
+    I:hellrock=2770
+    I:holystone=2771
+    I:ice=2805
+    I:icePillar=2772
+    I:iceStairs.0=2773
+    I:iceStairs.1=2774
+    I:iceStairs.2=2775
+    I:iceStairs.3=2776
+    I:iceStairs.4=2777
+    I:iceStairs.5=2778
+    I:iceStairs.6=2779
+    I:iceStairs.7=2780
+    I:lavastone=2781
+    I:lightgem=2782
+    I:netherBrick=2783
+    I:null=2784
+    I:obsidian=2785
+    I:roadLine=2786
+    I:sandSnakestone=2787
+    I:sandStone=2788
+    I:sandstoneScribbles=2789
+    I:snakestone=2791
+    I:snakestoneObsidian=2792
+    I:stoneMoss=2793
+    I:stonebrick=2794
+    I:stonebricksmooth=2795
+    I:temple=2796
+    I:templeMossy=2797
+    I:thinGlass=2798
+    I:tyrian=2799
+    I:wood-birch=2800
+    I:wood-jungle=2801
+    I:wood-oak=2802
+    I:wood-spruce=2803
+}
+
+
+####################
+# general
+####################
+
+general {
+    # Changes pane rendering algorithm a bit.
+    B:"Add panes"=true
+
+    # Use alternative crafting recipe for the chisel
+    B:"Alternative recipe"=false
+
+    # Amount of limestone to generate in the world; use 0 for none
+    I:"Worldgen limestone amount"=0
+
+    # Amount of marble to generate in the world; use 0 for none
+    I:"Worldgen marble amount"=6
+
+    # Traversing concrete roads, players will acceleration to this velocity. For reference, normal running speed is about 0.28. Set to 0 to disable acceleration.
+    D:"concrete velocity"=0.45
+
+    # Disable connected textures
+    B:"disable connected textures"=false
+
+    # Some blocks, like bookshelves and ice will not get overridden using "override vanilla blocks" setting. Set this to true to disable all overriding.
+    B:"disable overriding blocks"=true
+
+    # Reworks ice blocks to drop Ice shards when destroyed
+    B:"ice drops ice shards"=true
+
+    # Use old pillar textures
+    B:"old pillar graphics"=false
+
+    # If true, will override vanilla blocks with their chisel variations. If false, will create one new chiseled block for each vanilla block that can be chiseled.
+    B:"override vanilla blocks"=false
+
+    # Particle tick rate. Greater value = less particles.
+    I:"particle tickrate"=1
+
+    # Make variations of blocks have the same name, and use the description in tooltip to distinguish them.
+    B:"use block descriptions in tooltips"=true
+
+    # Add a new tab in creative mode and put all blocks that work with chisel there.
+    B:"use custom creative tab"=true
+}
+
+
+####################
+# item
+####################
+
+item {
+    I:ballOMoss=7814
+    I:chisel=7811
+    I:cloudInABottle=7813
+    I:iceshard=7812
+}
+
+
+####################
+# tweaks
+####################
+
+tweaks {
+    # Unlocalized name of the block that, when burned, will produce concrete (examples: lightgem, stone)
+    S:"concrete recipe block"=gravel
+}
+
+

config/GregTech/DynamicConfig.cfg

@@ -17093,9 +17093,9 @@ smelting {
     B:tile.Precious902.1_true=true
     B:tile.Precious902.3_true=true
     B:tile.Utility905.10_true=true
-    B:tile.anvil.intact_true=true
-    B:tile.anvil.slightlyDamaged_true=true
-    B:tile.anvil.veryDamaged_true=true
+    B:tile.anvil.intact_true=false
+    B:tile.anvil.slightlyDamaged_true=false
+    B:tile.anvil.veryDamaged_true=false
     B:"tile.atomicscience:oreUranium.blank_true"=true
     B:"tile.atomicscience:oreUranium_true"=true
     B:tile.blockCopperOre_true=true
@@ -17125,7 +17125,7 @@ smelting {
     B:tile.netherores.ore.tin_true=true
     B:tile.netherores.ore.uranium_true=true
     B:tile.oreBlocks.copperOre_true=true
-    B:tile.railcraft.block.anvil.intact_true=true
+    B:tile.railcraft.block.anvil.intact_true=false
     B:tile.resources.1_true=true
     B:tile.resources.2_true=true
     B:tile.thermalexpansion.ore.copper.name_true=true

config/OpenBlocks.cfg

@@ -71,7 +71,7 @@ block {
     I:blockGoldenEggId=2580
 
     # The id of the grave block
-    I:blockGraveId=2546
+    I:blockGraveId=0
 
     # The id of the guide
     I:blockGuideId=2541
@@ -282,7 +282,7 @@ glasses {
 ####################
 
 grave {
-    B:enableGraves=true
+    B:enableGraves=false
     I:ghostProbability=0
 }
 

config/TPPI/TPPITweaks.cfg

@@ -230,7 +230,7 @@ item {
     S:packName=Test Pack Please Ignore
 
     # The version of the pack
-    S:packVerison=1.0.0pre
+    S:packVerison=1.0.2pre
 }
 
 

config/TPPI/changelog.txt

@@ -1,3 +1,34 @@
+TPPIv1.0.2PreRelease~
+- Yay, more fixes \o/~
+~
+- Actually fixed libraries this time~
+~
+- Updated Thaumic Reliquary to v1.1.1. MCPC compat.~
+~~~
+- Lowered Botania flower spawn rate. If you are still having issues with FPS (though you should not, even with a lower end pc), you can lower these even further in the botania config. They can be safely spawned with bonemeal.~
+~~~
+- Reverted (and updated) Chisel to 1.5.1. Most of your problems should be gone.~
+~
+- Updated TPPItweaks to 1.0.0-10. Fixes IC2 issues, adds some security to the txt reading.~
+~
+- Fixed anvil auto-smelting dupe.~
+~~~
+- Updated ElectroMagicTools to v1.0.9. Fixes crash with essential generators.~
+~
+- Readded chisel blocks to FMP config~
+~~~
+Notes about updating~
+~
+- If you are getting advanced genetics spam, just suicide (we would rather you not tenable the features we specifically disabled).~
+~
+- Chisel blocks may disappear. This is unavoidable.~
+~~~
+TPPIv1.0.1PreRelease~
+~
+- Hotfix for broken libraries~
+~
+- Enable Minetweaker on client
+~~~
 TPPIv1.0PreRelease~
 ~
 - Yes, it is true! This is hopefully the last beta version. We feel confident enough in the balance and stability of the pack to fully release this in what will hopefully be the next version!~
@@ -107,7 +138,7 @@ Config/Modpack Tweaks~
 ~~~
 - Mariculture is permanently removed~
 ~
-- Removed Essence Seeds.~
+- Removed Essence Seed recipe.~
 ~
 - EnderIO conduits back to default size due to FPS issues.~
 ~~~