Investiture implementation#2
Draft
RequestingKidney wants to merge 1195 commits into
Draft
Conversation
There are none, but the skeleton's there now
There wasn't much to do
Without creative tabs, hard to figure out when it doesn't build
…ntly the main remaining erroring files.
Signed-off-by: SoaringEaqle <158627775+SoaringEaqle@users.noreply.github.com>
…led without allomancy/feruchemy
Updated a few textures
…oken Curios strings
… and Feruchemical gold
[Cosmere] Patchouli updates
…mprovements-76 God Metal Improvements
…HemalurgyTLC Hemalurgy Spiritweb Integrity
* bug fix * Stabilizing metal vial and consuming metals * fix consumption of atium
* adding attribute translations! * translations for aviar
* adding attribute translations! * translations for aviar * cleanup for god metal nuggets to use attributes
# Conflicts: # src/main/java/leaf/cosmere/common/cap/entity/SpiritwebCapability.java
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
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.
Changes proposed in this pull request: