GrapeSodaGames/gsg-luanti
2
0
Fork 0
Code Issues 65 Pull requests 1 Projects Releases 1 Packages Wiki Activity Actions

WIP: combat rebalance #8

Draft
gsg_josh wants to merge 1 commit from combat-rebalance into master
pull from: combat-rebalance
merge into: GrapeSodaGames:master
Conversation 0 Commits 1 Files changed 1 +24 -24
gsg_josh commented 2025-09-06 18:31:24 +00:00 (Migrated from codeberg.org)
Copy link

closes #1

closes #1
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin combat-rebalance:combat-rebalance
git switch combat-rebalance

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff combat-rebalance
git switch combat-rebalance
git rebase master
git switch master
git merge --ff-only combat-rebalance
git switch combat-rebalance
git rebase master
git switch master
git merge --no-ff combat-rebalance
git switch master
git merge --squash combat-rebalance
git switch master
git merge --ff-only combat-rebalance
git switch master
git merge combat-rebalance
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
balance

   
bug

   
doc

   
enhancement

   
infrastructure

   
lua
  
status
complete
Complete and implemented into the code base.

  
status
needs design
Tasks have been looked at and decided to implement.

  
status
needs fixing
Something was found in testing, and needs to be fixed. Once fixed, sent back to "needs review".

  
status
needs implementation
Design is complete and work needs to be done

  
status
needs review
Implementation is complete and needs review for functionality and code quality

  
status
needs testing
Functionality has been confirmed to work in ideal situations, edge cases and other interactions need to be verified.

  
status
new
New tasks that have not been looked at.

  
status
rejected
Tasks that have been looked at and decided against doing

No labels
balance
bug
doc
enhancement
infrastructure
lua
status
complete
status
needs design
status
needs fixing
status
needs implementation
status
needs review
status
needs testing
status
new
status
rejected
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
GrapeSodaGames/gsg-luanti!8
No description provided.