juniper/Minecraft-Vanilla-Notebook
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases 5 Packages Wiki Activity Actions

multiloader/26.1 #3

Open
juniper wants to merge 15 commits from multiloader/26.1 into main
pull from: multiloader/26.1
merge into: juniper:main
Conversation 1 Commits 15 Files changed 47 +327 -317
juniper commented 2026-04-19 18:12:11 +01:00
Owner
Copy link
  • Bumped version to v5.1.0
  • Support for Fabric, Quilt & NeoForge - No longer just fabric
  • No longer depends on FAPI (Except for resource loading)
  • mlem API is now a dependency (https://forgejo.sillyjune.xyz/mlem/mlem-api)
- Bumped version to v5.1.0 - Support for Fabric, Quilt & NeoForge - No longer just fabric - No longer depends on FAPI (Except for resource loading) - mlem API is now a dependency (https://forgejo.sillyjune.xyz/mlem/mlem-api)
Update version string
Some checks failed
/ build (push) Failing after 6m26s
Details
fd4006770e
Update workflow java version
All checks were successful
/ build (push) Successful in 5m42s
Details
2768f83959
mlem API multiloader
Some checks failed
/ build (push) Has been cancelled
Details
df818db94b
Re-Add licence
Some checks failed
/ build (push) Failing after 5m55s
Details
73cdf1cb2c
Update to new MLEM API version and implement keybinds
All checks were successful
/ build (push) Successful in 6m18s
Details
7980f8eb9e
WIP Mixins
All checks were successful
/ build (push) Successful in 8m48s
Details
f84da79d95
fix: mixins
All checks were successful
/ build (push) Successful in 7m49s
Details
4ec06d47a2
feat: logo for neoforge
All checks were successful
/ build (pull_request) Successful in 10m42s
Details
/ build (push) Successful in 8m39s
Details
4df0d7ca21
juniper commented 2026-04-19 18:13:19 +01:00
Author
Owner
Copy link

This will be merged and a release made when mlem API is reviewed on modrinth.

This will be merged and a release made when mlem API is reviewed on modrinth.
Re-add README
All checks were successful
/ build (push) Successful in 7m56s
Details
/ build (pull_request) Successful in 8m17s
Details
d3b883f6b2
Update src/main/resources/assets/notebook/lang/tt_ru.json
All checks were successful
/ build (push) Successful in 7m16s
Details
/ build (pull_request) Successful in 52m58s
Details
16e2662d4c
Update src/main/resources/assets/notebook/lang/tt_ru.json
All checks were successful
/ build (push) Successful in 9m27s
Details
/ build (pull_request) Successful in 57m47s
Details
cc52ac2df6
All checks were successful
/ build (push) Successful in 9m27s
Details
/ build (pull_request) Successful in 57m47s
Details
This pull request has changes conflicting with the target branch.
  • gradle.properties
  • src/client/resources/fabric.mod.json
  • src/main/java/xyz/sillyjune/notebook/client/Notebook.java
  • src/main/java/xyz/sillyjune/notebook/client/mixin/TitleScreenButton.java
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

Merge

Merge the changes and update on Forgejo.
git switch main
git merge --no-ff multiloader/26.1
git switch multiloader/26.1
git rebase main
git switch main
git merge --ff-only multiloader/26.1
git switch multiloader/26.1
git rebase main
git switch main
git merge --no-ff multiloader/26.1
git switch main
git merge --squash multiloader/26.1
git switch main
git merge --ff-only multiloader/26.1
git switch main
git merge multiloader/26.1
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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
juniper/Minecraft-Vanilla-Notebook!3
No description provided.