[DONE] Split create and destruction EMC Methods. API/Methods only#1036
Open
MaPePeR wants to merge 14 commits intosinkillerj:masterfrom
Open
[DONE] Split create and destruction EMC Methods. API/Methods only#1036MaPePeR wants to merge 14 commits intosinkillerj:masterfrom
MaPePeR wants to merge 14 commits intosinkillerj:masterfrom
Conversation
…alueForCreation' Conflicts: src/main/java/moze_intel/projecte/playerData/Transmutation.java
Conflicts: src/main/java/moze_intel/projecte/events/ToolTipEvent.java src/main/java/moze_intel/projecte/utils/EMCHelper.java
Conflicts: src/main/java/moze_intel/projecte/api/proxy/IEMCProxy.java
Conflicts: src/main/java/moze_intel/projecte/gameObjs/container/inventory/TransmutationInventory.java
Contributor
Author
|
I think we even might need another method that does |
Conflicts: src/main/java/moze_intel/projecte/playerData/Transmutation.java
This was referenced Jul 5, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also contains #984 (Use this link to see the new changes made on top of that PR)
Cherry picked some commits from #992/#1015.
getEMCinto a version for creation and a version for destruction.The only difference is, that destruction EMC honors enchantment bonus and destruction multiplier for now. (Which should fix #988 and fix #1047 as a side effect)