Skip to content

[pull] master from GeyserMC:master - #786

Open
pull[bot] wants to merge 87 commits into
ign-gg:masterfrom
GeyserMC:master
Open

[pull] master from GeyserMC:master#786
pull[bot] wants to merge 87 commits into
ign-gg:masterfrom
GeyserMC:master

Conversation

@pull

@pull pull Bot commented Jul 10, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

onebeastchris and others added 30 commits June 14, 2026 16:09
Remove state from potent sulfur in backport mapping

Fix minimal string usage

Co-authored-by: Eclipse <eclipse@eclipseisoffline.xyz>
* Re-work ResolvableComponent/ComponentCache to be applied to every Item

* Load resolvable registry components from to-be-generated mappings

* Support loading holder set resolvable components, target mappings with newly generated file

* Fix tests

* Abstract ComponentCache with ResolvableComponentGetter and EMPTY implementation

* Proper handling of PROVIDES_TRIM_MATERIAL in TrimRecipes

* Address reviews

* Target latest 26.2 mappings
@pull pull Bot locked and limited conversation to collaborators Jul 10, 2026
@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Jul 10, 2026
valaphee and others added 23 commits July 10, 2026 21:01
#6529)

Co-authored-by: chris <github@onechris.mozmail.com>
…across reloads (#6531)

Co-authored-by: onebeastchris <github@onechris.mozmail.com>
* Fix anvil level costs for damageable items on Bedrock

* Don't treat an enchantment as incompatible with itself when merging
* Border collision XZ should be floored.

* We also needs to set width and height to zero.

* wrong value????!

* actually no.

* oops.
…arability, and fix stackable equippable custom items (#6539)

* Give custom skull items their own components for correct icons and wearability, and fix stackable equippable custom items

* Register custom skull items through the custom item registry instead of hand-building their components

* Undo the API change and give custom skulls their block placer internally
* Only send the stack size component to clients that support it

* Use the existing GameProtocol version check
* Fix logging under rare conditions

* Improve fix
* Update for changes in the mappings-generator datagen-rewrite

* Checkout mappings to master
* 26.40 update

* Add debug command for packets, bump protocol

* Fix joining

* Fix older versions, bump connection, warn when player isn't spawned

* Fix players not showing

* Bump version, update readme

* Fix scoreboard not being updated as the remove has to be set per-score entry now

* Fix scoreboard not being updated as the remove has to be set per-score entry now

* Add custom skull JSON mappings and deprecate custom-skulls.yml file (#6481)

* Add custom skull JSON mappings

* Don't register custom skull textures twice

* Deprecate custom-skulls.yml file, add automatic migration to skull JSON mappings

* Resolve reviews

* Just delete custom-skulls.yml if it was empty

* Remove debug command, fixup a few debug logger

---------

Co-authored-by: Novampr <auroranova8756@gmail.com>
Co-authored-by: Valaphee <iam@valaphee.com>
Co-authored-by: Eclipse <eclipse@eclipseisoffline.xyz>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Development

Successfully merging this pull request may close these issues.

7 participants