Skip to content

Port Villager Market to 1.21.1 and 26.3 - #21

Merged
faceofcat merged 3 commits into
mainfrom
port/all
Nov 2, 2026
Merged

faceofcat merged 3 commits into
mainfrom
port/all

Conversation

@faceofcat

Copy link
Copy Markdown
Collaborator

Summary

  • Rebuilds Villager Market on Stonecutter for NeoForge 1.21.1, NeoForge 26.3, and Fabric 26.3. One block still trades with every villager within 48 blocks, using the offer's adjusted price and matching item components.
  • Adds CI, Discord merge notifications, and Modrinth/CurseForge/GitHub publish workflows on this line only. The 1.12 branch is unchanged and has none of them.
  • Keeps the original crate textures and GUI. Version 2.0.0. No release tag is pushed and no repository secrets are filled in here.

Test plan

  • :26.3:test and :1.21.1:test
  • NeoForge 26.3 and NeoForge 1.21.1 server game tests (four trade cases)
  • Fabric 26.3 server game tests
  • Stonecutter switch to 1.21.1 and back leaves the sources unchanged
  • Release script tests (changelog, commit, CurseForge versions)
  • CI on this pull request
  • After merge, set the GitHub default branch to main and leave 1.12 in place

Made with Cursor

One block still trades with nearby villagers. CI, Discord, and publish workflows are on this line only, so the 1.12 branch stays a Forge snapshot.
@CLAassistant

CLAassistant commented Nov 2, 2026 •

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

CI invokes ./gradlew, and a Windows checkout had committed it without the executable bit.
art/ui.pdn is stored with its own line endings. Marking every file as text made a fresh checkout change it, and the source check then failed.
@faceofcat
faceofcat merged commit 87ac9e4 into main Nov 2, 2026
5 checks passed
@faceofcat
faceofcat deleted the port/all branch November 2, 2026 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants