Closed Baertram closed 6 years ago
looks like there are conflicts on all of these.
You should be able to push directly into this branch without a pull request, if you want to try resolving them manually.
edit: and yeah you can, since you completed two of the four lol
Still new to github, not sure how to relsove them so I manually copied the whole new files into the editor. And during this my internet connection broke... :-)
Wrong
-> The crafting tab inside the normal inventory is too wide now as jewelry trait and jewelry materials were added. The ALL button overlays the text at the left. Maybe one could combine the "Traits" of weapons, armor and jewelry into one button.