Skip to content
This repository has been archived by the owner on Apr 8, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
UndeadZeratul committed May 29, 2016
2 parents 63fd390 + 62d7322 commit 62eb160
Show file tree
Hide file tree
Showing 479 changed files with 93,804 additions and 6,220 deletions.
27 changes: 27 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Hey there. Looks like you want to contribute with an issue. Great. Here's what you have to do:
* Have a look through the [Issue Tracker](https://github.com/UndeadZeratul/ThereWillBeBlood/issues), to see if your issue has been solved already;
* Read through the steps on [Bug Reporting 101](http://vazkii.us/br101/) (You may skip this if you're already familiar with reporting issues, but it's good for newcomers);

* Note the following points:
* When reporting an issue, please include the version of the modpack (can be found on the title screen), which launcher you are using, and a link to pastebin with any crash report you have received.
* Issues regarding outdated versions of the modpack are **not accepted**;
* Duplicate issues or issues that have been solved already (use the search feature!) will be closed without asking.
* Do not tag your issues' names. "Something Broke" is prefered to "[Bug] Something Broke" because there's a proper label system in place.
* If you are going to post a suggestion, post one, not a wish list; it’s easier to track and manage that way.

The following "bugs" are not accepted:
* Intended Behaviour
* Constantly dying.
* Not a TWBB problem/Not fixable
* Crash on startup with any mod that isn’t [in this list](https://github.com/UndeadZeratul/ThereWillBeBlood/blob/master/Versions.md)
* Flowers don't render (Optifine issue)

---

If you want to make a Pull Request keep these in mind:
* Do not use the github editor. Test your PRs before you submit them.
* Unless you have a very good reason for it, keep your PRs all in one commit. You can do it with [rebase](https://git-scm.com/docs/git-rebase).

---

Thanks to Vazkii for the contributing guidelines. 8/8 gr8 job m8
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ reports/
saves/
screenshots/

config/fastcraft*
config/mapwriter*
config/opis*
config/versionchecker*
*/config/fastcraft*
*/config/mapwriter*
*/config/opis*
*/config/versionchecker*

*.jar
*.lck
*.rar
1213309934
Expand Down
59 changes: 59 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
node {

stage 'Checkout'

// Get some code from a GitHub repository
git branch: env.BRANCH_NAME, url: 'https://github.com/UndeadZeratul/ThereWillBeBlood.git'

stage 'Copy Mod Pack Downloader'
bat "del /s /q \"*.jar\""
step([$class: 'CopyArtifact',
filter: 'target/*.jar',
fingerprintArtifacts: true,
flatten: true,
projectName: 'Mod Pack Downloader',
selector: [$class: 'StatusBuildSelector',
stable: false]])

bat '''del /s /q "common\\base\\loaders\\*.jar"
del /s /q "common\\base\\mods\\*.jar"
del /s /q "client\\base\\mods\\*.jar"
del /s /q "server\\base\\mods\\*.jar"
exit 0'''

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'''

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
for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
java -jar "%modpackdownloader%" client/base/mods.json 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'''

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
for /f "delims=" %%i IN (\'dir *.jar /b\') DO set modpackdownloader=%%i
java -jar "%modpackdownloader%" server/prod/mods.json server/prod/mods'''

// Mark the code build 'stage'....
stage 'Build Pack'
// Get the maven tool.
def mvnHome = tool 'maven'

if(env.BRANCH_NAME.contains("release") || env.BRANCH_NAME.contains("master")){
profileName = "master"
}
else{
profileName = "develop"
}

// Run the maven build
bat "\"${mvnHome}\\bin\\mvn\" clean package -D profile.${profileName} -Dbuild.number=${env.BUILD_NUMBER}"

stage 'Archive'
archive 'target/*.zip,launcher/**/modpack.json,launcher/**/src/mods/*.json'
}
72 changes: 54 additions & 18 deletions Permissions.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
[Better Beginnings License]: http://minecraft.curseforge.com/projects/betterbeginnings-mod/license
[Chameleon Creepers Notification]: http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2628395-chameleon-creepers-creepers-take-the-color-of?comment=41
[Creeper Awareness MCF Thread]: http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2328246
[FatherToast's MCF Thread]:http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1282771
[Forge Auto-Shutdown License]:http://minecraft.curseforge.com/projects/forgeautoshutdown/license
[FTB Permission Website]:http://www.feed-the-beast.com/mods
[Hammerz License]:https://github.com/VapourDrive/Hammerz/blob/master/LICENSE
[Harder Wildlife Permission]:http://i.imgur.com/YYLpNsR.png
[HCEE Notification]:https://i.imgur.com/TzX1qCf.png
[Item Physics Notification]:https://i.imgur.com/SruHzlI.png
[Iguana's Tweaks License]:https://github.com/Parker8283/IguanaTweaks/blob/master/LICENSE
[LiMI's License]:http://minecraft.curseforge.com/projects/limi/license
[NincraftLib License]: https://github.com/Nincraft/NincraftLib/blob/master/LICENSE
[SaltyMod Notification]: http://i.imgur.com/7eoP5Vr.png
[TWBB Tweaks License]: https://github.com/UndeadZeratul/TWBB-Tweaks/blob/master/LICENSE
[Ye Olde Tanks License]: https://github.com/shadowfacts/YeOldeTanks/blob/master/LICENSE.md

- **Agricraft** by: *InfinityRaider*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Alternate Terrain Generation** by: *TTFTCUTS*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Another One Bites The Dust** by: *Ganymedes01*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand All @@ -39,6 +42,9 @@
- **AsieLib** by: *asie*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Better Beginnings** by: *einsteinsci*
- **Private Packs**: Open: [Better Beginnings License]
- **Public Packs** : Open: [Better Beginnings License]
- **Better Foliage** by: *OctarineNoise*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand All @@ -60,6 +66,12 @@
- **bspkrs Core** by: *bspkrs*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Chameleon Creepers** by: *Vel0cityX*
- **Private Packs**: Notified: [Chameleon Creepers Notification]
- **Public Packs** : Notified: [Chameleon Creepers Notification]
- **Climate Control** by: *Zeno410*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **CoFH Core** by: *CoFH Team*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand All @@ -78,7 +90,7 @@
- **Creeper Awareness** by: *elix_x*
- **Private Packs**: Open: [Creeper Awareness MCF Thread]
- **Public Packs** : Open: [Creeper Awareness MCF Thread]
- **Damage Indicators Mod** by: *rich1051414*
- **Custom Ore Generation** by: *noogenesis*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Dark Menagerie** by: *RWTema*
Expand Down Expand Up @@ -108,30 +120,54 @@
- **Dynamic Lights** by: *AtomicStryker*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Dynamic Surroundings** by: *OreCruncher*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **EnderCore** by: *tterrag1098, CrazyPants*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Enviromine** by: *TimbukTato*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **EXCore** by: *Elix_x*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **ExtraTiC** by: *Glassmaker*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Falling Meteors** by: *AlexDGr8r*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Farseek API** by: *delvr*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **FastCraft (Optional)** by: *Player*
- **Private Packs**: Manual Download via Modpack Tweaks.
- **Public Packs** : Manual Download via Modpack Tweaks.
- **Flaxbeard's Steam Power** by: *Flaxbeard, Esteemed Innovation*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Forge Auto-Shutdown** by: *Polaris_iv*
- **Private Packs**: Open: [Forge Auto-Shutdown License]
- **Public Packs** : Open: [Forge Auto-Shutdown License]
- **Forge Multipart** by: *Chickenbones*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Hammerz** by: *VapourDrive*
- **Private Packs**: Open: [Hammerz License]
- **Public Packs** : Open: [Hammerz License]
- **Hardcore Darkness** by: *Lumien*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Hardcore Ender Expansion** by: *chylex*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Notified: [HCEE Notification]
- **Harder Wildlife** by: *Draco18s*
- **Private Packs**: PERMISSION GRANTED: [Harder Wildlife Permission]
- **Public Packs** : PERMISSION GRANTED: [Harder Wildlife Permission]
- **HardLib** by: *Draco18s*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Hunger Overhaul** by: *iguana_man*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand All @@ -144,9 +180,6 @@
- **Infernal Mobs** by: *AtomicStryker*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **InfiniBows** by: *Myrathi*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **INPureCore** by: *denoflionsx*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand All @@ -156,6 +189,9 @@
- **Item Physic Lite** by: *CreativeMD*
- **Private Packs**: Notified: [Item Physics Notification]
- **Public Packs** : Notified: [Item Physics Notification]
- **LiMI** by: *Vazkii*
- **Private Packs**: Open: [LiMI's License]
- **Public Packs** : Open: [LiMI's License]
- **Lunatrius Core** by: *Lunatrius*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand Down Expand Up @@ -207,7 +243,7 @@
- **Not Enough Items** by: *Chickenbones*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Open Eye** by: *Mikeemoo, boq*
- **Ore Flowers** by: *Draco18s*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Pam's HarvestCraft** by: *MatrexsVigil*
Expand All @@ -216,9 +252,6 @@
- **Pam's Temperate Plants** by: *MatrexsVigil*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **PneumaticCraft** by: *MineMaarten*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **PoorOres** by: *Xexanos*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand All @@ -228,6 +261,15 @@
- **Random Things** by: *Lumien*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Realistic Terrain Generation** by: *WhichOnesPink*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **SaltyMod** by: *Liahim85*
- **Private Packs**: Notified: [SaltyMod Notification]
- **Public Packs** : Notified: [SaltyMod Notification]
- **Simple Achievements** by: *insaneau, tterrag1098*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Somnia** by: *Kingrunes*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand All @@ -249,7 +291,7 @@
- **Stalker Creepers** by: *AtomicStryker*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Status Effect HUD** by: *bspkrs*
- **Streams** by: *delvr*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Thermal Foundation** by: *TeamCoFH*
Expand All @@ -273,12 +315,6 @@
- **Twilight Forest** by: *Benimatic*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **WAILA** by: *ProfMobius*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **WAWLA** by: *Darkhax*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
- **Weather** by: *Corosauce*
- **Private Packs**: Open: [FTB Permission Website]
- **Public Packs** : Open: [FTB Permission Website]
Expand Down
22 changes: 13 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
There Will Be Blood
===
A public repository for all changes to my Hardcore 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.
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_.

Expand Down Expand Up @@ -30,28 +30,33 @@ In addition to the mining level adjustments made in TWBB, there has also been a
| Tin | 230 |
| Lead | 375 |
| Zinc | 420 |
| Glass | 550 |
| Emerald | 650 |
| Aluminum | 660 |
| __Crude Oil-fueled Smeltery__ | __0 - 1000__ |
| __Ignatius-fueled Smeltery__ | __0 - 1600__ |
| Brass | 925 |
| Aluminum Brass | 950 |
| Bronze | 950 |
| Silver | 950 |
| Electrum | 1000 |
| __Diesel-Fueled Smeltery__ | __0 - 1250__ |
| Gold | 1050 |
| Hepatizon | 1075 |
| Copper | 1080 |
| __Kerosene-Fueled Smeltery__ | __0 - 1500__ |
| Black Steel | 1400 |
| Iron | 1400 |
| Pig Iron | 1400 |
| Invar | 1425 |
| Nickel | 1450 |
| Steel | 1500 |
| __Gasoline-Fueled Smeltery, High Oven__ | __0 - 2000__ |
| Ignatius | 1600 |
| Meteorite | 1600 |
| __High Oven__ | __0 - 2000__ |
| Platinum | 1750 |
| __Pyrotheum-Fueled Smeltery__ | __0 - 3000__ |
| Kreknorite | 2000 |
| Vulcanite | 2000 |
| __Vulcanite-Fueled Smeltery__ | __0 - 2400__ |
| Sanguinite | 2250 |
| __Pyrotheum-Fueled Smeltery__ | __0 - 3200__ |
| Adamantine | 2500 |
| Endium | 2500 |
| Eximite | 2750 |
Expand All @@ -72,16 +77,15 @@ I've gone ahead and made a spreadsheet of every ore/resource in TWBB, as well as

Modpack Requirements
===
TWBB requires Java 8 to run due to "Ye Olde Tanks". If you cannot or do not want to run with Java 8, you'll have to disable or remove that mod. If Java 8 is not being used, be sure to allocate at least 128MBs to the Permgen.

Otherwise, the pack 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.
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
===
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
===
Expand Down
Loading

0 comments on commit 62eb160

Please sign in to comment.