me/e4mc_minecraft
7
7
Fork 12
Code Issues 30 Pull requests 3 Projects Releases Packages Wiki Activity

Update simplified Chinese #61

Open
GodGun968 wants to merge 1 commit from GodGun968/e4mc_minecraft:main into main
pull from: GodGun968/e4mc_minecraft:main
merge into: me:main
Conversation 0 Commits 1 Files changed 1 +2 -1
GodGun968 commented 2024-03-09 09:35:43 +02:00
Contributor
Copy link
No description provided.
GodGun968 added 1 commit 2024-03-09 09:35:43 +02:00
This pull request has changes conflicting with the target branch.
  • src/main/resources/assets/e4mc_quilt/lang/zh_cn.json
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u main:GodGun968-main
git checkout GodGun968-main

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 checkout main
git merge --no-ff GodGun968-main
git checkout GodGun968-main
git rebase main
git checkout main
git merge --ff-only GodGun968-main
git checkout GodGun968-main
git rebase main
git checkout main
git merge --no-ff GodGun968-main
git checkout main
git merge --squash GodGun968-main
git checkout main
git merge --ff-only GodGun968-main
git checkout main
git merge GodGun968-main
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
could not reproduce

epheremal server issue, maybe.

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
forge

forge is very fucky

  
help wanted

Need some help

  
invalid

Something is wrong

  
log for fucks sake

no details or logs whatsoever

  
question

More information is needed

  
relay-au

   
relay-de

   
relay-jp

   
relay-us

   
wontfix

This won't be fixed

No labels
bug
could not reproduce
duplicate
enhancement
forge
help wanted
invalid
log for fucks sake
question
relay-au
relay-de
relay-jp
relay-us
wontfix
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: me/e4mc_minecraft#61
No description provided.
Delete branch "GodGun968/e4mc_minecraft:main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?