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

[DONE] Split create and destruction EMC Methods. API/Methods only #1036

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[DONE] Split create and destruction EMC Methods. API/Methods only #1036

wants to merge 14 commits into from

Commits on Oct 4, 2015

  1. Deprecate old methods

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    38f114b View commit details
    Browse the repository at this point in the history

  2. new getEmc-Methods

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    2daaf68 View commit details
    Browse the repository at this point in the history

  3. first emc separation for creation/destruction

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    7893866 View commit details
    Browse the repository at this point in the history

  4. Split 'doesItemHaveEmc' into 'hasEmcValueForDestruction' and 'hasEmcV… 

    …alueForCreation'

Conflicts:
	src/main/java/moze_intel/projecte/playerData/Transmutation.java
    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    5761067 View commit details
    Browse the repository at this point in the history

  5. Use Correct hasEMC/getEMC-variant

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    a0566f0 View commit details
    Browse the repository at this point in the history

  6. Update Diving Rod and Collector

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    1e134ee View commit details
    Browse the repository at this point in the history

  7. Remove even more of the old EMCHelper-Calls 

    Conflicts:
	src/main/java/moze_intel/projecte/events/ToolTipEvent.java
	src/main/java/moze_intel/projecte/utils/EMCHelper.java
    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    86ab55f View commit details
    Browse the repository at this point in the history

  8. Check for hasEmcValueForDestruction in Transmutation shift-click

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    6403559 View commit details
    Browse the repository at this point in the history

  9. New API methods. Deprecate old api methods. 

    Conflicts:
	src/main/java/moze_intel/projecte/api/proxy/IEMCProxy.java
    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    c43a5ed View commit details
    Browse the repository at this point in the history

  10. use correct 'hasEmcForDestruction' method in API implementation

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    dc9105b View commit details
    Browse the repository at this point in the history

  11. Use API-Exceptions in EMCHelper, too.

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    6615d36 View commit details
    Browse the repository at this point in the history

  12. Use the same emc map for creation/destruction emc

    @MaPePeR
    MaPePeR committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    b84dc46 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2015

  1. Merge branch 'master' into splitBuyAndSellApiOnly 

    Conflicts:
	src/main/java/moze_intel/projecte/gameObjs/container/inventory/TransmutationInventory.java
    @MaPePeR
    MaPePeR committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    42d20ef View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2015

  1. Merge branch 'master' into splitBuyAndSellApiOnly 

    Conflicts:
	src/main/java/moze_intel/projecte/playerData/Transmutation.java
    @MaPePeR
    MaPePeR committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    9a3302e View commit details
    Browse the repository at this point in the history