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

[FEATURE] Weapon/Armor Leveling System (#23) #49

Merged
merged 13 commits into from
Dec 13, 2024
Merged

[FEATURE] Weapon/Armor Leveling System (#23) #49

merged 13 commits into from
Dec 13, 2024

Conversation

RedstoneWizard08
Copy link

Closes #23
WIP DO NOT MERGE

naomieow
naomieow requested changes Sep 16, 2024
View reviewed changes
Copy link
Contributor

@naomieow naomieow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not include formatting changes in a non-formatting PR.

build.gradle Outdated Show resolved Hide resolved
src/main/java/com/bibireden/playerex/mixin/ItemStackMixin.java Outdated Show resolved Hide resolved
src/main/java/com/bibireden/playerex/mixin/ItemStackMixin.java Outdated Show resolved Hide resolved
src/main/java/com/bibireden/playerex/mixin/ItemStackMixin.java Show resolved Hide resolved
@naomieow naomieow added ✨ Enhancement New feature or request. ✨ Major This is a major update to the code-base, and will be a long-term work. labels Sep 16, 2024
@naomieow
Revert some changes
7f85b68 
- Revert build.gradle
- Revert gradle.properties
- Remove asserts from ItemStackMixin.java
- Revert some lines in ItemStackMixin.java
naomieow
naomieow previously approved these changes Sep 16, 2024
View reviewed changes
@naomieow
Copy link
Contributor

Please set up GPG/SSH signing for your commits

@naomieow
[feat] XP increases on kill
8c7d9dc 
- Weapon XP increases by a value specified in the config when a mob is killed
- Moved XP from an attribute to NBT
@RedstoneWizard08
Copy link
Author

Please do not include formatting changes in a non-formatting PR.

Ok, will do.

@RedstoneWizard08
Copy link
Author

Please set up GPG/SSH signing for your commits
I'll work with Poke on that, as I don't know how. I've only ever used git over HTTPS.

@naomieow
Copy link
Contributor

I'll work with Poke on that, as I don't know how. I've only ever used git over HTTPS.

You can sign your commits with GPG when using HTTPS auth - git just also allows you to sign with SSH as well. I personally use SSH auth and GPG signing. Here is the GitHub documentation for setting up GPG signing.

@RedstoneWizard08
Copy link
Author

btw @naomieow I can prob work on this again tomorrow, I've been busy with homework until now

@naomieow
Copy link
Contributor

btw @naomieow I can prob work on this again tomorrow, I've been busy with homework until now

awesome, am currently working on getting basic armour levelling working right now

@bibi-reden bibi-reden marked this pull request as ready for review December 13, 2024 22:54
@bibi-reden bibi-reden self-requested a review December 13, 2024 22:55
bibi-reden
bibi-reden approved these changes Dec 13, 2024
View reviewed changes
Copy link
Collaborator

@bibi-reden bibi-reden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@bibi-reden bibi-reden merged commit b691a03 into BareMinimumStudios:1.20.1/fabric Dec 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bibi-reden bibi-reden bibi-reden approved these changes

@naomieow naomieow naomieow left review comments

Assignees

@naomieow naomieow

@RedstoneWizard08 RedstoneWizard08

Labels
✨ Enhancement New feature or request. ✨ Major This is a major update to the code-base, and will be a long-term work.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEATURE] Weapon/Armor Levelling System
3 participants
@RedstoneWizard08 @naomieow @bibi-reden