Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.0.3 Merge #316

Merged
merged 47 commits into from
Apr 24, 2014
Merged

1.0.3 Merge #316

merged 47 commits into from
Apr 24, 2014

Commits on Mar 31, 2014

  1. Added pestles, mortars, and pestle and mortars to tool rack

    @esKaayY
    esKaayY committed Mar 31, 2014
    Configuration menu
    Copy the full SHA
    43798d4 View commit details
    Browse the repository at this point in the history

  2. Updated FAQ, disabled update checks for MFR/NetherOres

    @esKaayY
    esKaayY committed Mar 31, 2014
    Configuration menu
    Copy the full SHA
    633c6e7 View commit details
    Browse the repository at this point in the history

  3. Implemented a loss with ET converter

    @esKaayY
    esKaayY committed Mar 31, 2014
    Configuration menu
    Copy the full SHA
    44a4c44 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2014

  1. Permanently remove mod download instructions

    @tterrag1098
    tterrag1098 committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    7f5ba03 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2014

  1. This may or may not work

    @esKaayY
    esKaayY committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    e5489e5 View commit details
    Browse the repository at this point in the history

  2. Well I know THIS will work 

    This and the previous will hopefully prevent a massive dupe bug
    @esKaayY
    esKaayY committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    f4ab32e View commit details
    Browse the repository at this point in the history

  3. Revert "Well I know THIS will work" 

    This reverts commit f4ab32e.
AAAAAAAND not necessary
    @esKaayY
    esKaayY committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    c34ee4e View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2014

  1. More professional looking Readme for public release

    @tterrag1098
    tterrag1098 committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    4a516dd View commit details
    Browse the repository at this point in the history

  2. Add contribution instructions

    @tterrag1098
    tterrag1098 committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    11e4106 View commit details
    Browse the repository at this point in the history

  3. Add book files to TPPI config dir

    @tterrag1098
    tterrag1098 committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    1e79ca8 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2014

  1. Add a bunch of recipes to the SAG mill. If anyone wants to do the All… 

    …oy Smelter...be my guest.
    @tterrag1098
    tterrag1098 committed Apr 5, 2014
    Configuration menu
    Copy the full SHA
    473be41 View commit details
    Browse the repository at this point in the history

  2. Remind me again why industrial diamonds exist?

    @tterrag1098
    tterrag1098 committed Apr 5, 2014
    Configuration menu
    Copy the full SHA
    44f01f7 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2014

  1. FZ Update

    wha-ha-ha committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    f08a047 View commit details
    Browse the repository at this point in the history

  2. Make some cheaty server commands op-only

    @tterrag1098
    tterrag1098 committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    4cef888 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2014

  1. Renabled Mystcraft Book Receptacle 

    We're sad it's come to this, but issues with EP3 has left us no choice. EP3 will be getting removed.
    @esKaayY
    esKaayY committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    39d2db5 View commit details
    Browse the repository at this point in the history

  2. Turned on blast furnace capabilities for aluminium

    @esKaayY
    esKaayY committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    b08ceae View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2014

  1. Disabled Cyanite from SAGmilling Yellorium 

    You’re supposed to process it in a reactor first..
    @esKaayY
    esKaayY committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    52da8e2 View commit details
    Browse the repository at this point in the history

  2. Update core.cfg 

    With receptacles being enabled again, disarming needs to be disabled to prevent it from becoming a source of item duplication.
    Professor29 committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    9d167fa View commit details
    Browse the repository at this point in the history

  3. Merge pull request #297 from Professor29/patch-1 

    Update core.cfg
    @esKaayY
    esKaayY committed Apr 8, 2014
    Configuration menu
    Copy the full SHA
    f35d544 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2014

  1. More SAGmill work

    @esKaayY
    esKaayY committed Apr 9, 2014
    Configuration menu
    Copy the full SHA
    db08d16 View commit details
    Browse the repository at this point in the history

  2. Prevents massive glowstone exploit

    @esKaayY
    esKaayY committed Apr 9, 2014
    3 Configuration menu
    Copy the full SHA
    3528d66 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2014

  1. Update Readme to more accurately reflect RAM requirements 

    Also updated ModVersions to reflect newest FZ, because the self
proclaimed “greatest pack dev ever” didn’t do it when she updated the
config ;)
    @esKaayY
    esKaayY committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    2827227 View commit details
    Browse the repository at this point in the history

  2. yay, snow! \o/

    @esKaayY
    esKaayY committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    4b5619d View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2014

  1. Fixed Infernal Tweaks config 

    Kobold and Taint Sheep should not be infernal, added missing config
entries
    @esKaayY
    esKaayY committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    d8370a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2014

  1. AM2 Dig Spell Blacklist 

    Adding known problem blocks to Dig spell to prevent dupe issues and/or blocks not dropping.  Includes select blocks from following mods: Additional Buildcraft Objects, Applied Energistics, Buildcraft, Dartcraft, Extra Utilities, GregTech, IC2-Experimental, Logistics Pipes, Mekanism, MineFactory Reloaded, Thaumcraft.
    Professor29 committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    1097e5a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #305 from Professor29/patch-2 

    AM2 Dig Spell Blacklist - thanks prof!
    @esKaayY
    esKaayY committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    8097790 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2014

  1. Update for 1.0.3pre

    @esKaayY
    esKaayY committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    52b39b5 View commit details
    Browse the repository at this point in the history

  2. Misc. 1.0.3 updates

    @esKaayY
    esKaayY committed Apr 18, 2014
    1 Configuration menu
    Copy the full SHA
    034a566 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2014

  1. Removed essence drops from magical crops

    @esKaayY
    esKaayY committed Apr 19, 2014
    Configuration menu
    Copy the full SHA
    f7ce7ae View commit details
    Browse the repository at this point in the history

  2. Prevents SAGmill from giving industrial diamonds instead of vanilla ones

    @esKaayY
    esKaayY committed Apr 19, 2014
    Configuration menu
    Copy the full SHA
    e3e599d View commit details
    Browse the repository at this point in the history

  3. Cuz tterrag r n00b

    @esKaayY
    esKaayY committed Apr 19, 2014
    Configuration menu
    Copy the full SHA
    c8af066 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2014

  1. Add new TR config option

    Tristen Allen committed Apr 21, 2014
    Configuration menu
    Copy the full SHA
    9bf5f34 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #312 from Spyboticsguy/Dev 

    Add new TR config option
    @esKaayY
    esKaayY committed Apr 21, 2014
    Configuration menu
    Copy the full SHA
    d400f79 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. Revert "Whitelisted barrels on Mekanism cardboard box list" 

    This reverts commit 6221c93.
    @esKaayY
    esKaayY committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    55dbcdb View commit details
    Browse the repository at this point in the history

  2. Update BoxBlacklist.txt 

    Factorization does not play nice with Cardboard Boxes. Adding blanket ban of any block of 2174 (factorization machines) and 9318 (factorization barrels) to prevent players from using boxes on them.
    Professor29 committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    bc6fdd0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #314 from Professor29/patch-3 

    Update BoxBlacklist.txt
    @tterrag1098
    tterrag1098 committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    f94f479 View commit details
    Browse the repository at this point in the history

  4. Added tainted soil to digger backpack

    @esKaayY
    esKaayY committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    8640053 View commit details
    Browse the repository at this point in the history

  5. Added some blood magic stuff to the toolrack

    @esKaayY
    esKaayY committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    64c7491 View commit details
    Browse the repository at this point in the history

  6. Update changelog.txt 

    Adding changelog for modpack version 1.0.3.
    @Professor29
    Professor29 committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    a6663ca View commit details
    Browse the repository at this point in the history

  7. Merge pull request #315 from Professor29/patch-4 

    Adding Changelog for 1.0.3.
    @tterrag1098
    tterrag1098 committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    d279d5d View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2014

  1. Goodbye, dupes

    @tterrag1098
    tterrag1098 committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    25fa6ed View commit details
    Browse the repository at this point in the history

  2. Updated tppitweaks and changelog

    @esKaayY
    esKaayY committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    e2bb796 View commit details
    Browse the repository at this point in the history

  3. Typo

    @esKaayY
    esKaayY committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    e1b70c9 View commit details
    Browse the repository at this point in the history

  4. Update ModVersions.txt

    @tterrag1098
    tterrag1098 committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    6d7fd31 View commit details
    Browse the repository at this point in the history

  5. Last minute 1.0.3 changes

    @tterrag1098
    tterrag1098 committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    37555fa View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. Safeguarding

    @esKaayY
    esKaayY committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    4e3e84a View commit details
    Browse the repository at this point in the history

  2. Revert "Safeguarding" 

    This reverts commit 4e3e84a.
    @esKaayY
    esKaayY committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    a288d88 View commit details
    Browse the repository at this point in the history