TwitchTrot/TrotCraft
3
0
Fork 0
Code Issues Pull requests 1 Projects Releases 3 Packages Wiki Activity Actions

WIP: Upgrade to 1.21 #10

Draft
ArcaneSpark wants to merge 38 commits from alpha-1.21-server into main
pull from: alpha-1.21-server
merge into: TwitchTrot:main
Conversation 0 Commits 38 Files changed 79 +379 -259
ArcaneSpark commented 2024-07-05 22:17:54 +02:00
Owner
Copy link

this is work in progress please don't merge

this is work in progress please don't merge
ArcaneSpark added 3 commits 2024-07-05 22:17:54 +02:00
ArcaneSpark added 1 commit 2024-07-08 14:20:05 +02:00
ArcaneSpark added 2 commits 2024-07-10 11:35:23 +02:00
ArcaneSpark added 1 commit 2024-07-10 11:37:56 +02:00
ArcaneSpark added 1 commit 2024-07-10 11:42:10 +02:00
ArcaneSpark added 1 commit 2024-07-10 23:40:15 +02:00
ArcaneSpark added 1 commit 2024-07-10 23:41:34 +02:00
ArcaneSpark added 1 commit 2024-07-11 10:25:32 +02:00
ArcaneSpark added 1 commit 2024-07-11 10:28:17 +02:00
ArcaneSpark added 1 commit 2024-07-12 08:32:26 +02:00
ArcaneSpark added 1 commit 2024-07-16 13:02:58 +02:00
ArcaneSpark added 3 commits 2024-07-18 20:42:20 +02:00
ArcaneSpark added 1 commit 2024-07-22 09:30:36 +02:00
ArcaneSpark added 1 commit 2024-07-23 17:06:27 +02:00
ArcaneSpark added 1 commit 2024-07-27 13:59:09 +02:00
ArcaneSpark added 1 commit 2024-07-31 08:49:44 +02:00
ArcaneSpark added 1 commit 2024-08-01 19:45:39 +02:00
ArcaneSpark added 1 commit 2024-08-06 11:48:20 +02:00
ArcaneSpark added 2 commits 2024-08-08 21:14:00 +02:00
ArcaneSpark added 1 commit 2024-08-09 11:50:53 +02:00
ArcaneSpark added 1 commit 2024-08-10 18:01:15 +02:00
ArcaneSpark added 1 commit 2024-08-15 13:46:58 +02:00
ArcaneSpark added 1 commit 2024-08-19 14:23:02 +02:00
ArcaneSpark added 1 commit 2024-08-19 14:26:59 +02:00
ArcaneSpark added 1 commit 2024-08-19 14:32:46 +02:00
ArcaneSpark added 1 commit 2024-08-19 22:27:07 +02:00
ArcaneSpark added 1 commit 2024-08-19 22:28:18 +02:00
ArcaneSpark added 1 commit 2024-08-22 21:17:36 +02:00
ArcaneSpark added 1 commit 2024-08-24 11:11:17 +02:00
ArcaneSpark added 1 commit 2024-08-24 11:12:50 +02:00
ArcaneSpark added 1 commit 2024-08-29 14:19:05 +02:00
ArcaneSpark added 1 commit 2024-09-08 13:18:34 +02:00
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin alpha-1.21-server:alpha-1.21-server
git checkout alpha-1.21-server

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff alpha-1.21-server
git checkout main
git merge --ff-only alpha-1.21-server
git checkout alpha-1.21-server
git rebase main
git checkout main
git merge --no-ff alpha-1.21-server
git checkout main
git merge --squash alpha-1.21-server
git checkout main
git merge --ff-only alpha-1.21-server
git checkout main
git merge alpha-1.21-server
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
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: TwitchTrot/TrotCraft#10
No description provided.
Delete branch "alpha-1.21-server"

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?