Merge branch 'release/v1.1.0'

Jenkinsfile

@@ -23,21 +23,21 @@ node {
 
    stage 'Download Common mods'
    bat '''for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
-          java -jar "%modpackdownloader%" common/base/mods.json common/base/mods'''
+          java -jar "%modpackdownloader%" -manifest common/base/mods.json -folder common/base/mods'''
 
    stage 'Download Client mods'
    bat '''for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
-          java -jar "%modpackdownloader%" client/dev/mods.json client/dev/mods
+          java -jar "%modpackdownloader%" -manifest client/dev/mods.json  -folder client/dev/mods
           for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
-          java -jar "%modpackdownloader%" client/base/mods.json client/base/mods
+          java -jar "%modpackdownloader%" -manifest client/base/mods.json -folder client/base/mods
           for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
-          java -jar "%modpackdownloader%" client/prod/mods.json client/prod/mods'''
+          java -jar "%modpackdownloader%" -manifest client/prod/mods.json -folder client/prod/mods'''
 
    stage 'Download Server mods'
    bat '''for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
-          java -jar "%modpackdownloader%" server/base/mods.json server/base/mods
+          java -jar "%modpackdownloader%" -manifest server/base/mods.json -folder server/base/mods
           for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
-          java -jar "%modpackdownloader%" server/prod/mods.json server/prod/mods'''
+          java -jar "%modpackdownloader%" -manifest server/prod/mods.json -folder server/prod/mods'''
 
    // Mark the code build 'stage'....
    stage 'Build Pack'
@@ -56,4 +56,4 @@ node {
 
    stage 'Archive'
    archive 'target/*.zip,launcher/**/modpack.json,launcher/**/src/mods/*.json'
-}
+}

Permissions.md

@@ -291,6 +291,9 @@
 - **Stalker Creepers** by: *AtomicStryker*
   - **Private Packs**: Open: [FTB Permission Website]
   - **Public Packs** : Open: [FTB Permission Website]
+- **Starting Inventory** by: *bspkrs*
+  - **Private Packs**: Open: [FTB Permission Website]
+  - **Public Packs** : Open: [FTB Permission Website]
 - **Streams** by: *delvr*
   - **Private Packs**: Open: [FTB Permission Website]
   - **Public Packs** : Open: [FTB Permission Website]
@@ -318,9 +321,6 @@
 - **Weather** by: *Corosauce*
   - **Private Packs**: Open: [FTB Permission Website]
   - **Public Packs** : Open: [FTB Permission Website]
-- **YAMPST** by: *bilde2910*
-  - **Private Packs**: Open: [FTB Permission Website]
-  - **Public Packs** : Open: [FTB Permission Website]
 - **Ye Olde Tanks** by: *Shadowfacts*
   - **Private Packs**: Open: [Ye Olde Tanks License]
   - **Public Packs** : Open: [Ye Olde Tanks License]

README.md

@@ -1,5 +1,7 @@
-There Will Be Blood
-===
+# There Will Be Blood
+
+[![](http://cf.way2muchnoise.eu/233250.svg)](https://minecraft.curseforge.com/projects/there-will-be-blood)
+
 A public repository for all changes to my Simply Brutal Modpack project.  This modpack focuses on the world around you and its inhabitants; namely how much they loathe your existance and want you gone.  Everything in this pack is geared towards giving you a bad time.  You will fight to survive against not only difficult mobs with increased intelligence, but also against the enviroment itself.  You'll need to stay hydrated, regulate your body's internal temperature as well as fatigue, and watch out for the occasional pockets of various gases found under the earth.  The deeper you mine, the harder time you'll have breathing, and will need to find cleaner air in order to not suffocate.  Even staving off hunger might be an issue; as you'll need to eat a varied and balanced diet in order to stay healthy.  You might be thinking, "this sounds insane!" and in a way, you'd be right; as certain mobs, especially those found in The Nether, will cause you to lose a bit of your sanity.
 
 If you think you're up for the challenge, give this pack a try; but be warned, _there will be blood_.
@@ -22,18 +24,20 @@ Ores and other resources have had their mining levels re-balanced in order to gi
 | Adamantine | 9 |
 | Desichalkos (Eximite + Meutoite) | 10 |
 
-In addition to the mining level adjustments made in TWBB, there has also been a significant Ore Processing change.  All metals follow a more realistic melting point paradigm.  Thanks to Tinkers' Construct, each and every ore now requires at least the Smeltery, if not the Tinkers' Steelworks High Oven, to be processed.  To give you an idea, here's a chart of the temperatures required to melt down various ores, as well as the types of smelteries used to melt down said ores:
+In addition to the mining level adjustments made in TWBB, there has also been a significant Ore Processing change.  All metals follow a more realistic melting point paradigm.  Thanks to Tinkers' Construct, each and every ore now requires at least the Smeltery, if not the Tinkers' Steelworks High Oven, to be processed.  However, **TiC Tools themselves have been disabled; the Smeltery & High Oven are only for structuring progression.**
+
+To give you an idea, here's a chart of the temperatures required to melt down various ores, as well as the types of smelteries used to melt down said ores:
 
 | Ore/Resource | Melting Point (*C) |
 | ----------- | -----------------: |
-| __Lava-Fueled Smeltery__ | __0 - 800__ |
+| __Lava-Fueled Smeltery__ | __0 - 1200__ |
 | Tin | 230 |
 | Lead | 375 |
 | Zinc | 420 |
 | Glass | 550 |
 | Emerald | 650 |
 | Aluminum | 660 |
-| __Ignatius-fueled Smeltery__ | __0 - 1600__ | 
+| Seared Stone | 750 |
 | Brass | 925 |
 | Aluminum Brass | 950 |
 | Bronze | 950 |
@@ -42,53 +46,56 @@ In addition to the mining level adjustments made in TWBB, there has also been a
 | Gold | 1050 |
 | Hepatizon | 1075 |
 | Copper | 1080 |
-| Black Steel | 1400 |
+| __Ignatius-fueled Smeltery__ | __0 - 1600__ |
+| Black Steel | 1345 |
+| Ironwood | 1365 |
 | Iron | 1400 |
 | Pig Iron | 1400 |
+| Steel | 1400 |
 | Invar | 1425 |
 | Nickel | 1450 |
-| Steel | 1500 |
 | Ignatius | 1600 |
 | Meteorite | 1600 |
-| __High Oven__ | __0 - 2000__ |
+| __Vulcanite-Fueled Smeltery, High Oven__ | __0 - 2000__ |
 | Platinum | 1750 |
+| Knightmetal | 1800 |
 | Kreknorite | 2000 |
 | Vulcanite | 2000 |
-| __Vulcanite-Fueled Smeltery__ | __0 - 2400__ |
+| __Pyrotheum-Fueled Smeltery__ | __0 - 3000__ |
 | Sanguinite | 2250 |
-| __Pyrotheum-Fueled Smeltery__ | __0 - 3200__ |
 | Adamantine | 2500 |
+| Ender Pearls | 2500 |
 | Endium | 2500 |
 | Eximite | 2750 |
 | Meutoite | 2750 |
 | Desichalkos | 3000 |
 
-Mod List
-===
+# Mod List
+
 [Current Mod List](https://github.com/UndeadZeratul/ThereWillBeBlood/blob/master/Versions.md)
 
-Modpack Permissions
-===
+# Modpack Permissions
+
 [Permission List](https://github.com/UndeadZeratul/ThereWillBeBlood/blob/master/Permissions.md)
 
-Reference Spreadsheet
-===
+# Reference Spreadsheet
+
 I've gone ahead and made a spreadsheet of every ore/resource in TWBB, as well as their equipment statistics, [here](https://drive.google.com/open?id=1l5xgq9EPYF-3owYx854fy4aVWIVfcB76Hcx0-4cm_kA).
 
-Modpack Requirements
-===
+# Modpack Requirements
+
 TWBB requires Java 8, and runs well with 2GBs of RAM, at least through my own personal testing.  If you can achieve a decent performance with more/less, let me know and I'll adjust.
 
-Installation
-===
+# Installation
+
 This modpack is currently hosted on the Technic Launcher as well as the Feed The Beast Launcher and Curse Voice Launcher.
 * For Technic, go to [the pack's webpage](http://www.technicpack.net/modpack/details/there-will-be-blood.511723) and copy the **Platform URL**.  Open up the Technic Launcher, click on the **Add New Pack** button, and paste the **Platform URL** into the textfield.  When you're done, select the modpack, and click play!
 * For FTB, go to the **Third Party Packs** tab, and click the **Pack Codes** button.  type in the pack code **TWBB** into the textfield.  When you're done, select the modpack, and click launch!
 * For Curse Voice, Click on the **Browse All Modpacks** button.  Type in "There Will Be Blood" into the search bar.  You should see the pack in the listing below.  Hover over the modpack, and click on the **Install** button to install.  Wait a bit for the mods to be downloaded and installed, and when it's done, click play!
 * For the Nincraft Launcher, you'll first have to download the latest version [here](https://github.com/Nincraft/Nincraft-Launcher/releases).  Run the launcher and click the modpack called "There Will Be Blood", and click "Launch".
 
-Contributing
-===
+# Contributing
+
 I love getting outside contributions, however doing so can be a little complex for some.
 
 First a note: If you are going to contribute, please make your contributions to the ___develop___ branch.

Versions.md

@@ -4,7 +4,7 @@ Current Forge Version
 
 Current API Versions
 =
-- **AppleCore** v1.3.0 by squeek
+- **AppleCore** v1.3.2 by squeek
 - **Aroma1997Core** v1.0.2.16 by Aroma1997, Schillaa
 - **asielib** v0.4.5 by asiekierka, Vexatos
 - **bspkrsCore** v6.16 by DaftPVF, bspkrs
@@ -13,8 +13,8 @@ Current API Versions
 - **Cookie Core** v1.4.0 by Ephys
 - **CreativeCore** v1.3.14
 - **Custom Ore Generation** v1.2.24 by JRoush, noogenesis
-- **EnderCore** v1.7.10-0.2.0.31_beta by tterrag, CrazyPants
-- **EXCore** v1.4.1 by Elix_x
+- **EnderCore** v1.7.10-0.2.0.36_beta by tterrag, CrazyPants
+- **EXCore** v1.5.3 by Elix_x
 - **Farseek** v1.0.11 by delvr
 - **Forge Microblocks** v1.2.0.345
 - **Forge Multipart** v1.2.0.345
@@ -25,80 +25,80 @@ Current API Versions
 - **Metallurgy Core** v4.0.4 by Team Metallurgy
 - **Nincraft Lib** v1.7.10-0.1.1+24 by Nincodedo
 - **SomniaCore** v1.3.1.55 by Kingrunes
-- **TNTUtils Core** v1.1.3 by ljfa
-- **YAMPST** v1.3.6 by bilde2910, Commador
+- **TNTUtils Core** v1.2 by ljfa
 
 Current Mod Versions
 =
 - **AgriCraft** v1.7.10-1.5.0 by InfinityRaider
 - **Air Overhaul** v1.7.10_1.0 by Mark719
-- **Another One Bites The Dust** v2.9.1 by ganymedes01
+- **Another One Bites The Dust** v2.9.2 by ganymedes01
 - **Another One Bites The Dust: Berry Bushes** v1.0.6 by ganymedes01
 - **Antique Atlas** v1.7.10-4.2.10
 - **AromaBackup** v0.1.0.0
 - **AromaBackup Recovery** v1.0
 - **Better Title Screen** v1.7.10-1.1 by Girafi, Amadornes
-- **BetterBeginnings** v0.9.5-R7 by einsteinsci, iLiminate, AnonTheMouse, Leviathan143
+- **BetterBeginnings** v0.9.5-R7a by einsteinsci, iLiminate, AnonTheMouse, Leviathan143
 - **BetterStorage** v0.13.1.127 by copygirl, Vic Nightfall
 - **Biomes O' Plenty** v2.1.0 by Adubbz, Amnet, Forstride, ted80
 - **Block Properties** v0.1.4 by FatherToast
 - **Blood Magic: Alchemical Wizardry** v1.3.3 by WayofTime
-- **Chameleon Creepers** v1.7.10-1.2 by Vel0cityX
-- **Climate Control** v0.5-beta50 by Zeno410
-- **Cooking for Blockheads** v1.0.134 by BlayTheNinth, ZeroTheShinigami
-- **Creeper Awareness** v2.0 by Elix_x
+- **Chameleon Creepers** v1.7.10-1.4.1 by Vel0cityX
+- **Climate Control** v0.6-beta57 by Zeno410
+- **Cooking for Blockheads** v1.0.140 by BlayTheNinth, ZeroTheShinigami
+- **Creeper Awareness** v2.0.1 by Elix_x
 - **Dark Menagerie** v1.0 ny RWTema
 - **Deadly World** v1.0.2 by FatherToast
 - **Dense Ores** v1.0 by RWTema
 - **Dimensional Doors** v2.2.5-test9 by StevenRS11, SenseiKiwi
-- **Doomlike Dungeons** v1.8.9
+- **Doomlike Dungeons** v1.8.10
 - **EnviroMine** v1.3.124 by Funwayguy, TimbuckTato, GenDeathrow, thislooksfun
 - **Falling Meteors** v2.14.3
-- **Flaxbeard's Steam Power** v1.7.10-0.29.2 by Elifoster, SatanicSanta, xbony2, dmillerw, Flaxbeard, Zenith
+- **Flaxbeard's Steam Power** v1.7.10-0.29.3 by Elifoster, SatanicSanta, xbony2, dmillerw, Flaxbeard, Zenith
 - **Hammerz** v0.1.7.37
 - **Hardcore Darkness** v1.7 by lumien
-- **Hardcore Ender Expansion** v1.8.5 by chylex
-- **Harder Wildlife** v13.21.0a by Draco18s
+- **Hardcore Ender Expansion** v1.8.6 by chylex
+- **Harder Wildlife** v15.26.1b by Draco18s
 - **Hunger Overhaul** v1.7.10-1.0.0.jenkins75 by iguana_man, Parker8283, progwml6, squeek502
 - **Iguana Tinker Tweaks** v1.7.10-2.1.6.163 by boni, iguana_man
 - **Iguana Tweaks** v2B by iguana_man
 - **Infernal Mobs** v1.6.0
 - **Inventory Tweaks** v1.59-dev-152-cf6e263
 - **Localized Weather & Storms** v2.3.11 by Corosus
 - **Lycanites Mobs** v1.13.0.5 - MC 1.7.10
-- **Metallurgy 4** v4.0.6 by Team Metallurgy
+- **Metallurgy 4** v4.0.8 by Team Metallurgy
 - **Mine & Blade Battlegear 2 - Bullseye** v1.7.10 by nerd-boy, GotoLink, coolAlias
 - **MineTweaker 3** v3.0.10 by Stan Hebben
 - **Mob Properties** v1.0.2 by FatherToast
-- **Mod Tweaker 2** v0.9.5 by Jaredlll08
+- **Mod Tweaker 2** v0.9.6 by Jaredlll08
 - **ModpackTweaks** v1.7.10-1.2.0-26 by tterrag1098
 - **Natura** v2.2.0
 - **Natural Absorption** v1.2.1 by FatherToast
 - **NEI Integration** v1.1.2 by tonius11
 - **Nether Ores** v1.7.10R2.3.1 by PowerCrystals, TehKrush, AtomicStryker, skyboy026
-- **Not Enough Items** v1.0.5.118 by ChickenBones
+- **Not Enough Items** v1.0.5.120 by ChickenBones
 - **Ore Flowers** v1.0.0 by Draco18s
 - **Pam's HarvestCraft** v1.7.10j by Pamela Collins
 - **Pam's Temperate Plants** v1.7.2b
 - **PoorOres** v1.7.10-1.4.8 by Xexanos
 - **Primitive Mobs** v1.0 by Daveyx0
 - **Random Things** v2.2.4 by Lumien
-- **Realistic Terrain Generation** v1.7.10-0.8.0-snapshot-5 by WhichOnesPink
+- **Realistic Terrain Generation** v1.7.10-1.0.1 by Team RTG
 - **RPGAdvMod** v1.0.0
-- **Salty Mod** v1.7.e by Liahim
+- **Salty Mod** v1.8.c by Liahim
 - **Simple Achievements** vMC1.7.10-1.1.0-21
 - **Somnia** v-au by Kingrunes
 - **Special AI** v1.1.2 by FatherToast
 - **Special Mobs** v3.2.2 by FatherToast
 - **Stackie** v1.6.0.36 by Lunatrius
 - **Stalker Creepers** v1.7.10-1.0.9 by AtomicStryker
+- **StartingInventory** v1.7.10.r03 by DaftPVF, bspkrs
 - **Streams** v0.2 by delvr
-- **The Spice of Life** v1.3.1 by squeek
+- **The Spice of Life** v1.3.2 by squeek
 - **The Twilight Forest** v2.3.7
 - **Thermal Foundation** v1.7.10R1.2.3 by Team CoFH
 - **Tinkers' Construct** v1.7.10-1.8.8.build991 by mDiyo, fuj1n, ProgWML6, Sunstrike, Pillbox, boni
 - **Tinkers' Steelworks** v1.7.10-1.1.2 by Toops
-- **TNTUtils** v1.1.3 by ljfa
+- **TNTUtils** v1.2 by ljfa
 - **TooMuchLoot** v4.0.1
 - **TWBB Tweaks** v1.7.10-1.0.0
 - **Ye Olde Tanks** v1.4.5 by Shadowfacts
@@ -112,7 +112,7 @@ Current Client Mod Versions
 Optional Client Mod Versions
 =
 - **ArmorStatusHUD** v1.28 by bspkrs
-- **Better Foliage** v2.0.5 by octarine-noise, Meringue
+- **Better Foliage** v2.0.9 by octarine-noise, Meringue
 - **DirectionHUD** v1.24 by bspkrs
 - **Dynamic Lights** v1.3.8
 - **Dynamic Surroundings** v1.0.5.6 by OreCruncher

client/base/config/ArmorStatusHUD.cfg

@@ -51,13 +51,13 @@ general {
     S:damageThresholdType=percent
 
     # Horizontal offset from the edge of the screen (when using right alignments the x offset is relative to the right edge of the screen) [range: -2147483648 ~ 2147483647, default: 2]
-    I:xOffset=2
+    I:xOffset=16
 
     # Set to true if you want the xOffset value to be applied when using a center alignment [default: false]
     B:applyXOffsetToCenter=false
 
     # Vertical offset from the edge of the screen (when using bottom alignments the y offset is relative to the bottom edge of the screen) [range: -2147483648 ~ 2147483647, default: 2]
-    I:yOffset=2
+    I:yOffset=24
 
     # Set to true if you want the yOffset value to be applied when using a middle alignment [default: false]
     B:applyYOffsetToMiddle=false

client/base/mods.json

@@ -9,7 +9,7 @@
       "name": "Armor Status HUD"
     },
     {
-      "fileID": 2291423,
+      "fileID": 2294982,
       "projectID": 228529,
       "name": "Better Foliage"
     },

common/base/config/HardcoreEnderExpansion.cfg

@@ -4,13 +4,13 @@ client {
     # Special text rendering mode for Ender Compendium, smooths out aliasing in Large GUI scale.
     I:compendiumSmoothText=1
 
-    # Custom music playing in the End dimension and custom Music Discs. If another mod that changes music is installed, HEE music will be disabled. Music download: http://hee-music.chylex.com
+    # Custom music playing in the End dimension and new Music Discs. Music download: https://hee-music.chylex.com
     B:enableMusic=true
 
     # 0 = enabled on April Fools, 1 = always enabled, 2 = never enabled.
     I:hardcoreEnderbaconMode=0
 
-    # Removes long delays between vanilla music tracks. If another mod that changes music is installed, the config option will be disabled.
+    # Removes long delays between vanilla music tracks. This will override music from other mods.
     B:removeVanillaDelay=false
 }
 

common/base/config/HarderWildlife.cfg

@@ -58,6 +58,12 @@ animals {
     #  [range: 5000 ~ 2000000, default: 24000]
     I:animalMaxAge=24000
 
+    # How often cows (and mooshrooms) can be milked, in seconds.
+    # Note: Cows can 'store' up to 3 buckets of milk, will not refill after having offspring,
+    # and reabsorb the milk if they're starving.
+    #  [range: 600 ~ 3600, default: 60]
+    I:cowMilkFrequency=60
+
     # Raw leather (rawhide) requires curing on a tanning rack before it can be used.
     #  [default: true]
     B:doRawLeather=true
@@ -127,11 +133,11 @@ seasons {
     # Allows snow to pile up when it snows and melt away again. [default: true]
     B:EnableSnowAccumulation=true
 
+    # Enable to see baseline temp/rain modifiers in console. [default: false]
+    B:LogWeather=false
+
     # Toggle for whether or not seasonal variation in weather should occur. [default: true]
     B:doSeasons=true
-
-    # [WAILA] Set to true to use ᴼC and cm.  Temperatures are only approximately equivalent to the real world
-    # at 10ᴼF = 0.1ᴼMC [default: false]
     B:metricUnits=false
 
     # How many Minecraft-Days it takes the moon to change phase ("1 week").