Skip to content

Commit

Permalink
Merge pull request #316 from TPPI-Dev/Dev
Browse files Browse the repository at this point in the history
1.0.3 Merge
  • Loading branch information
esKaayY committed Apr 24, 2014
2 parents 6414309 + a288d88 commit e7db387
Show file tree
Hide file tree
Showing 50 changed files with 2,386 additions and 357 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin
3 changes: 2 additions & 1 deletion FAQ.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Time Torch (Dartcraft - Balance)
Repair enchantment on infusing Dartcraft stuff (Balance - Repair isn’t intended for everything and shouldn’t be able to be applied on these extremely powerful weapons/armour)
All AM2 mobs except Mana Creepers are disabled (Lag, annoyance. To summon nature guardian, we added a recipe for its spawn egg)
Removed Flight from Advanced Genetics (Obvious balance reasons - controversial, but necessary to keep various mod items from being made completely obsolete)
Removed More Health Option from Advanced Genetics (Can add up with TiC hearts - which you should be using instead)
Removed More Health Option from Advanced Genetics (Stacks improperly with TiC hearts, leading to massive amounts of health)
Ethereal Processor from ElectroMagicTools (Prevents dupes with GT)

There may be more, but this is all I can see/remember for now.

Expand Down
53 changes: 27 additions & 26 deletions ModVersions.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Current Mod Versions

Additional Buildcraft Objects v1.0.7.558
Advanced Genetics v1.4.1
Advanced Genetics v1.4.2
Advanced Solar Panels v3.4.7
Applied Energistics rv14finale3
Armor Status HUD v1.15
Expand All @@ -15,41 +15,40 @@ Bibliowoods[Natura] v1.1
Big Reactors v0.3.0A
Binnies Mods v1.8.0
Biomes O' Plenty v1.2.1.416
Blood Magic v1.0.0
Blood Magic v1.0.1b
Botania beta16
BspkrsCore v5.3
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.5.1 (Big thanks to asie)
Chisel v1.5.2
Code Chicken Core v0.9.0.9
Code Chicken Lib v1.0.0.62
COFH Core v2.0.0.2
ComputerCraft v1.58
Damage Indicators v2.9.2.3
DartCraft v0.2.17
DartCraft v0.2.18
DenLib v3.2.6
Dimensional Anchors v57.1.95
ElectroMagicTools v1.0.9
Dimensional Anchors v57.1.96
ElectroMagicTools v1.0.9e
Emashers Resource v1.2.3.4 (lol)
EnderIO v0.11.3.331
EnderIO v1.0.1.353
Ender Prospecting v1.0.1.6
Ender Storage v1.4.3.6
Engineer's Toolbox v1.1.8.3
Enhanced Portals v3.0.0b5e
EVOC v1.0.0a
Extra Cells v1.6.7d
Extra Cells v1.6.8f
Extra Utilities v1.0.3c
Factorization v0.8.3.3
Factorization v0.8.34
FlatSigns v1.4.0.15
ForbiddenMagic pr0.32
ForbiddenMagic pr0.333
Forestry v2.3.1.1\
ForgeMultipart v1.0.0.250
Gendustry v1.0.3.41
Gravisuite v1.9.9a
GregTech v4.07o
Hardcore Ender Expansion v1.3.3
Hardcore Ender Expansion v1.5
iChunUtil v2.4.0
IC2 Nuclear Control v1.6.2e
ImmibisCore v57.2.0
Expand All @@ -58,16 +57,17 @@ IndustrialCraft2exp v2.0.397
InfernalMobs v1.6.4
InfiniBows v1.2.0.14
InventoryTweaks v1.57-devb86
IronChests v5.4.1.689
IronChests v5.4.1.702
JABBA v1.1.3
JourneyMap Unlimited v3.3.2
Logistics Pipes v0.7.4dev.96
Logistics Pipes v0.7.4dev.145
Magical Crops v3.2.0_Beta15a
Magic Bees v2.1.11
Mekanism v6.0.4.32
Mekanism Generators v6.0.4.32
MineFactoryReloaded v2.7.6-448
Mekanism v6.1.0.CUSTOM (combined jar)
Mekanism Generators v6.1.0.CUSTOM (combined jar)
MineFactoryReloaded v2.7.8-482
Minetweaker v2.3.1
Mobius Core v1.0.4
Mobius Core v1.2.0
Modular Force Field Systems v3.6.2.59
Modular Powersuits v0.10.0-92
Modular Powersuits Addons v1.6.4-884
Expand All @@ -77,6 +77,7 @@ Natura v2.1.14
NEIaddons v1.10.4.64
NEIplugins v1.1.0.6
Nether Ores v2.2.1-14
Not Enough Codecs v0.1
Not Enough Items v1.6.1.9
Not Enough Keys v0.0.4
Numina v0.1.2-55
Expand All @@ -85,7 +86,7 @@ OpenBlocks v1.2.7
OpenModsLib v0.4b
OpenPeripheralAddons v0.1.3
OpenPeripheralCore v0.3.3
Opis v1.1.2
Opis v1.2.1
Pam's Clay Spawn v1.6.4
Plugins for Forestry v3.2.30
PortalGun v2.0.2
Expand All @@ -96,25 +97,25 @@ Railcraft v8.4.0.0
RcDusts v0.0.6d
Redstone Arsenal v1.0.0.0
Reliquary v1.1Custom
RemoteIO v1.9.3a
ServerTools v1.6.4-22
RemoteIO v1.11
ServerTools v1.6.4-23
SlickUtil
SortFix v1.0
Steve's Carts 2.0.0b10
Steve's Factory Manager vA78
Steve's Factory Manager vA83
Thaumcraft v4.1.0g
Thaumic Reliquary v1.1.1
Thaumic Reliquary v1.1.1.TPPI
Thaumic Tinkerer v2.3-137
Thaumic Tinkerer KAMI vJ6
Thermal Expansion v3.0.0.2
Tinker's Construct v1.6.4-513
Tinker's Construct v1.5.5.4
Tinker's Mechworks v1.6.4-19
TPPITweaks v1.0.0-10
TPPITweaks v1.1.0-45
Translocators v1.1.0.15
Twilight Forest v1.20.3
Universal Electricity Core v3.1.0.74
Waila v1.5.1a
Wireless Redstone - CBE v1.4.0.7
Witchery v0-16-3_164
WorldCore v1.1.0.17
Zan's Minimap v1.6.4
Zan's Minimap v1.6.4
76 changes: 50 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,64 +1,88 @@
"Test Pack Please Ignore" -FTB Modpack
_Test Pack Please Ignore_ - Minecraft Modpack
===============

A github for public updates to the pack. We have a subreddit at http://www.reddit.com/r/TestPackPleaseIgnore/ . Thanks for reading!
A public repository for all changes to the pack.

We have a subreddit at http://www.reddit.com/r/TestPackPleaseIgnore/ . Thanks for reading!

Information
===============
"Test Pack Please Ignore" is a FTB pack made by members of the FTB reddit, officialy given the OK by Slowpoke himself.
_Test Pack Please Ignore_ is a third-party FTB pack made by members of the /r/FeedTheBeast subreddit, officially sanctioned by Slowpoke in late 2013.

To get the pack, enter the code "MegaSharkPunch" (no quotes) into the FTB private packs option.
To get the pack, enter the code __MegaSharkPunch__ into the FTB private packs option.

This pack runs best with at least 2.5 GB memory, and 256 MB of permgen. To set the permgen, go to the options tab and click on "Advanced Options". In additional java parameters, add the following (without the quotes): "-XX:PermSize=256M".
Clients: This pack runs best with at least 2.5 GB memory, and 256 MB of permgen. Permgen is automatically set by the FTB launcher, but to set the permgen in a different launcher add the following java parameter: __-XX:PermSize=256M__

~~~~ Obsolete ~~~~
Servers: The server download comes with recommended Java arguments. Those were used when initially testing this pack before it released, and it worked great. You may need to allocate more RAM if you have lots of concurrent players online. Never try and allocate too much, Java hates that.

_Upon launching the pack for the first time, you will be prompted with a GUI popup to download additional mods that we unfortunately didn't have permission to redistribute in our pack. Following the directions on the GUI will allow you to easily download the additional mods and place them in the correct directory folders. This is an optional process, but *highly* recommended to get the full TPPI experience. DO NOT CLOSE YOUR MINECRAFT UNTIL PROMPTED TO._

_Reminder for ad.fly: In the upper right hand corner of your window you will see text go from “please wait” to “5”->”4”…”1” then “SKIP AD”. Do not click anything on your screen except for that yellow “SKIP AD” button. This will automatically download Thaumcraft into your assigned download folder. Drag the newly downloaded mod into your mods folder, which can easily be opened by clicking the button on the GUI. Repeat for Twilight Forest by clicking “continue”._
When you enter a new world, our book, like the Tinker’s Construct one, will show up in your inventory. ___Read it!___

_After completion, the GUI will ask you to close the game: do so. After, simply relaunch with the same version and all of the mods will successfully load._

_SERVER OWNERS: Your players may have questions about this, refer them here or explain it to them yourself. Now, how will you server owners get Twilight Forest+Thaumcraft? You can either download the latest versions from the respective forum threads, or go through the same process as your clients and install them with our GUI after you launch the game._
Reporting Bugs
===============
Submit ___all___ bug reports on this github.

\~~~~~~~~~~~~~~~~~~~~
To open up an issue: click the issues tab on the right side of the page. Once there, click the “new issue” green button near the top right of the screen in the issues menu, and fill out the subject/title and the body paragraph.

When you enter a new world, our book, like the Tinker’s Construct one, will show up in your inventory. Read it!
What does a good bug report look like?

Bug Reports: Submit all bug reports on our github here: To open up an issue, simply click the “new issue” green button near the top right of the screen in the issues menu, fill out the subject/title and the body paragraph. What does a good bug report look like?
1. Steps to reproduce.
2. If the game crashed, or if one of the developers ask you to, a copy of your log on some sort of paste website. I recommend http://paste.ubuntu.com/, to allow for maximum characters.
3. Screenshots, if the issue warrants it and for clarification.

REMINDER: THIS IS A BETA AND SHOULD BE TREATED AS SUCH.
Any questions/comments/concerns can be brought up on our IRC _[here](http://webchat.esper.net/?channels=TestPackPleaseIgnore&prompt=1/#btn)_.

Any questions/comments/concerns can be brought up on our IRC here: http://webchat.esper.net/?channels=TestPackPleaseIgnore&prompt=1/#btn. For everything else you need to know, you can find the information on our own subreddit here: http://www.reddit.com/r/testpackpleaseignore.
For everything else you need to know, you can find the information on our own subreddit _[here](http://www.reddit.com/r/testpackpleaseignore)_.

MOST IMPORTANTLY, have fun :)

Contributers/Developers
Developers
===============

_esKaayY (IGN: esKaayY)_
###Current Team
- _esKaayY (IGN: esKaayY)_

- _tterrag (IGN/Reddit: tterrag1098)_

- _wha-ha-ha (IGN: wha\_ha\_ha)_

- _judge (IGN: JDGBOLT)_

- _dudeedud4 (IGN: sneezing-panda)_

###Past Members
- _phit (reddit: phitriz)_

- _Dr Soda (IGN: Epiksoda11)_

- _nsstrunks (IGN: nsstrunks)_

- _NEOidea (stellarcraft) (IGN: NEOidea)_

All contributors can be found _[here](https://github.com/TPPI-Dev/TestPackPleaseIgnore/graphs/contributors)_.


_Dr Soda (IGN: Epiksoda11)_
Contributing
===
We love getting outside contributions, especially to our mod documentation system, however doing so can be a little complex for some.

_nsstrunks (IGN: nsstrunks)_
First a note: If you are going to contribute, please make your contributions to the ___Dev___ branch, not master. Switch this by using the dropdown box on the main repo page.

_NEOidea (stellarcraft) (IGN: NEOidea)_
Also, if you are just planning on making a one-line change, or anything that just alters one file, you can simply find the file and press "edit", and github will do the rest.

_tterrag (IGN/Reddit: tterrag1098)_
To make any larger contributions, it is recommended to have [Github for Windows/Mac/Linux](https://help.github.com/articles/set-up-git) installed (use the orange button for the application, or the rest of the article for command line git).

_wha-ha-ha (IGN: wha\_ha\_ha)_
To do so you will need to make what is called a "fork" of this repository. To do this press the "Fork" button on the top right of the page, and github will create your own copy of this repository. Once that has completed, use the github application to "clone" this repository, [Github Help](http://help.github.com) can help you with this portion. Make the changes on your computer, then commit and push those back to your fork (again, refer to the github help documents).

_dudeedud4 (IGN: sneezing-panda)_
Once your fork has all the changes you want, you need to create a "pull request" on the main repository. To do this, go to the pull request tab on the right, and hit "new pull request". At the top of that screen hit "compare across forks", then choose the second dropdown on the first line to be "Dev", the first dropdown on the second line to be _your_ fork, and the final dropdown to be "Dev" again (This may require hitting "compare across forks" and "edit" quite a few times to get it right). If everything looks right, meaning you see all your commits on the screen, hit "Create pull request" and we will review it as soon as possible.

_phit (reddit: phitriz)_
Thank you for your help!

Current Modlist
===============
Google Doc. Modlist: http://bit.ly/tppi#btn
Google Doc. Modlist: http://bit.ly/TPPI-Modlist

Changelog
===============
Try "/tppi changelog" in-game.
Use the command _/tppi changelog_ in-game, or look _[here](https://github.com/TPPI-Dev/TestPackPleaseIgnore/blob/master/config/TPPI/changelog.txt)._
2 changes: 1 addition & 1 deletion config/AM2/AM2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ general {
B:WitchwoodLeafParticles=true

# Comma-separated list of block IDs that dig cannot break. If a block is flagged as unbreackable in code, Dig will already be unable to break it. There is no need to set it here (eg, bedrock, etc.). Dig also makes use of Forge block harvest checks. This is mainly for fine-tuning.
S:dig_blacklist=
S:dig_blacklist=851,852,2271,2412,2440,2444,2445,2446,2447,2448,2453,2527,3144,3464,3468,3474,3475,3484,3485,4327,6027,7130,7131,7132,7133,7134,7135,7137,7138,7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7157,7158,7159,7160,7161,7162,7163,7164,10456,10457,10459,10460,10556,10557,10558,10559,10560,10561,10656,10657,10658,19416,19417,19418,19419,19420,19421,19422,19423,19424,19425,19426,19427,19436,19437,19438,19439,19440,19443,19456,19457,19458,19459,19460,19461,19464,19476,19477,19478,19479,19480,25298,25304,30184
I:mage_villager_profession_id=29

# Comma-separated list of dimension IDs that AM should *not* do worldgen in.
Expand Down
2 changes: 1 addition & 1 deletion config/AM2/SkillConf.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ general {
B:Damage=true
B:Daylight=true
B:Dig=true
B:Disarm=true
B:Disarm=false
B:Dispel=true
B:DivineIntervention=true
B:Drought=true
Expand Down
2 changes: 2 additions & 0 deletions config/AWWayofTime.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ block {
I:BlockHomHeart=1419
I:BlockPedestal=1420
I:BlockPlinth=1421
I:BlockSpectralContainer=1430
I:BlockSpellEffect=1426
I:BlockSpellEnhancement=1429
I:BlockSpellModifier=1428
Expand Down Expand Up @@ -109,6 +110,7 @@ item {
I:ItemBloodRuneBlock=17017
I:ItemKeyOfDiablo=17081
I:ItemRitualDiviner=17059
I:ItemSigilOfSupression=17088
I:LavaCrystal=17003
I:LavaSigil=17005
I:Magicales=17062
Expand Down
2 changes: 1 addition & 1 deletion config/BiblioCraft.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ general {
S:AdditionalPotions=essence, mead, bottle, test, element, molecule, can, capsule, cell, catalyst, ambrosia, honey pot, dissipation, vial, juice

# 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.
S:AdditionalTools=sprayer, wand, rod, scepter, wrench, screwdriver, meter, handsaw, gun, cutter, scoop, soldering, painter, reader, shovel, grafter, pickaxe, pipette, magnifying, sword, axe, hammer, saw, knife, file, configurator, bow, crowbar
S:AdditionalTools=sprayer, wand, rod, scepter, wrench, screwdriver, meter, handsaw, gun, cutter, scoop, soldering, painter, reader, shovel, grafter, pickaxe, pipette, magnifying, sword, axe, hammer, saw, knife, file, configurator, bow, crowbar, pestle, mortar, dagger, diviner, ritual

# Should blank books be allowed on Bookcases? (true or false)
B:AllowEmptyBooks=true
Expand Down
2 changes: 1 addition & 1 deletion config/Botania.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ general {
B:lexicon.render.3D=true

# Set to false to remove the overriding of vanilla blocks (snow, red and yellow flowers). Setting this to false will remove the snow on flowers tweak.
B:override.vanillaBlocks=true
B:override.vanillaBlocks=false

# Set to true to set the power system's particles to be a lot more subtle. Good for low-end systems, if the particles are causing lag.
B:powerSystem.subtle=false
Expand Down
21 changes: 18 additions & 3 deletions config/DIAdvancedCompatibility.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2542,11 +2542,26 @@ enhancedportals {

####################
# brainlessenderman
####################

brainlessenderman {
B:Append_Baby_Name=true
D:Baby_Scale_Modifier=2.0
B:Ignore_This_Mob=false
S:Name=
S:Scale_Factor=22.0
S:Size_Modifier=0.0
S:X_Offset=0.0
S:Y_Offset=-5.0
}

####################
# firefiend
#===================
# These settings are to help other modders and users to make custom mobs fit correctly in the preview window.
####################

brainlessenderman {
firefiend {
# Append Baby to this entity type if it is a baby.
B:Append_Baby_Name=true

Expand All @@ -2573,12 +2588,12 @@ enhancedportals {
}

####################
# firefiend
# paralyzedenderman
#===================
# These settings are to help other modders and users to make custom mobs fit correctly in the preview window.
####################

firefiend {
paralyzedenderman {
# Append Baby to this entity type if it is a baby.
B:Append_Baby_Name=true

Expand Down
9 changes: 9 additions & 0 deletions config/DartCraft/main.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ client {
# Render Time Particles.
B:"Time Particles"=true

# Render Force Leaves with Transparency.
B:"Transparent Leaves"=true

# Moves the player's hearts to the top-left part of the screen with the magic meter. (Note Health could still display if another mod does not adhere to Forge standards.)
B:"Zelda Hud"=false
}
Expand Down Expand Up @@ -476,6 +479,9 @@ upgrades {
# Max level for Sturdy Upgrade (1-3) (default: 2)
I:"Sturdy Level"=2

# Tier for the Time Upgrade (1-7)
I:"Time Tier"=3

# (0-3) 0 = Enemies can randomly drop Bags, 1 = Enemies can randomly drop cards, 2 = Treasure Needed for Bags, 3 = Treasure needed for cards.
I:"Treasure Level"=3
}
Expand Down Expand Up @@ -520,6 +526,9 @@ wrench {

# Allow Force Wrenching of TileEntities with blacklisted items.
B:"Sierpinski's Wrench"=true

# Allow Force Wrenching of TileEntities and TileBox placement by simulated players.
B:"Simulated Players"=false
}


Loading

0 comments on commit e7db387

Please sign in to comment.