Skip to content

Commit

Permalink
Merge pull request #353 from TPPI-Dev/Dev
Browse files Browse the repository at this point in the history
Merge 1.0.4 into master
  • Loading branch information
tterrag1098 committed May 26, 2014
2 parents e7db387 + 0071d26 commit 1f787ad
Show file tree
Hide file tree
Showing 33 changed files with 2,958 additions and 3,205 deletions.
1 change: 0 additions & 1 deletion FAQ.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Spatial IO stuff (AE - Unstable)
Bibliocraft can only make 2 copies using one plate and uses more XP (Balance, discourages exploit)
Pixies and Phantom mobs are disabled (BoP)
Force Shears (Dartcraft - Prevents crash on servers)
Book Receptacle (Mystcraft - Encourages Enhanced Portals more balanced method of distance travel of entities and portals w/o accessing a GUI)
Portal Guns cannot be found in dungeon loot, you must craft it (Portal Gun - Balance)
Hammering of non-basic plates using the forge hammer is disabled (Gregtech/IC2 - Basic=Gold, Iron, Copper, etc.. Non-basic=Stainless Steel, Titanium, etc.. Balance)
Uncrafting Table (Twilight Forest - Prevents known and probably unknown exploits)
Expand Down
29 changes: 22 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,40 @@ Developers
===============

###Current Team
- _esKaayY (IGN: esKaayY)_
- _sneezing\_panda (/u/dudeedud4)_

- _tterrag (IGN/Reddit: tterrag1098)_
- _esKaayY (/u/esKaayY)_

- _wha-ha-ha (IGN: wha\_ha\_ha)_
- _Judge (/u/JDGBOLT)_

- _judge (IGN: JDGBOLT)_
- _Spyboticsguy (/u/spyboticsguy)_

- _timewarp (/u/timewarp)_

- _tterrag (/u/tterrag1098)_

- _wha-ha-ha (/u/wha-ha-ha)_

- _dudeedud4 (IGN: sneezing-panda)_

###Past Members
- _phit (reddit: phitriz)_
- _collinmurphy (/u/collinmurphy)_

- _Devin\_Steinkoenig (/u/Devon\_Steinkoenig)_

- _Dr Soda (IGN: Epiksoda11)_

- _nsstrunks (IGN: nsstrunks)_
- _Nevik (/u/GTNLnevik)_

- _LaloLalo1999 (/u/LaloLalo1999)_

- _micspam (/u/micspamtf2)_

- _NEOidea (stellarcraft) (IGN: NEOidea)_

- _nsstrunks (IGN: nsstrunks)_

- _phit (/u/phitriz)_

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


Expand Down
Loading

0 comments on commit 1f787ad

Please sign in to comment.