Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conventional Biome Tags tweaks #2955

Merged
merged 3 commits into from
Mar 15, 2023

Conversation

maityyy
Copy link
Contributor

@maityyy maityyy commented Mar 8, 2023

See #2330 & #2649

Copy link
Contributor

@apple502j apple502j left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run datagen and generate files

@Juuxel Juuxel added enhancement New feature or request priority:low Low priority PRs that don't immediately need to be resolved labels Mar 8, 2023
@Juuxel Juuxel requested a review from a team March 8, 2023 09:50
@modmuss50 modmuss50 merged commit 315602f into FabricMC:1.19.4 Mar 15, 2023
modmuss50 pushed a commit that referenced this pull request Mar 15, 2023
* Birch Forest Tag #2330

* Fix #2649

* Run datagen

(cherry picked from commit 315602f)
modmuss50 pushed a commit that referenced this pull request Mar 15, 2023
* Birch Forest Tag #2330

* Fix #2649

* Run datagen

(cherry picked from commit 315602f)
(cherry picked from commit 521b5c5)
modmuss50 pushed a commit that referenced this pull request Mar 15, 2023
* Birch Forest Tag #2330

* Fix #2649

* Run datagen

(cherry picked from commit 315602f)
(cherry picked from commit 521b5c5)
(cherry picked from commit 4bc6e26)
EnnuiL pushed a commit to QuiltMC/quilted-fabric-api that referenced this pull request Mar 26, 2023
* Indigo shade related fixes and other changes (FabricMC#2898)

* Apply disabled shade from vanilla quads directly to material

- Remove QuadViewImpl.shade

* Fix enhanced AO calculation and respect non-terrain culling state

- Fix AoCalculator using AO face data computed with a potentially different shade state
- Move non-cached computation code to separate method in AoCalculator
- Turn AoCalculator's brightnessFunc and aoFunc into abstract methods
- Do not check null check world in non-terrain AO calculation since it cannot be null
- Pass through lightFace and shade state as method arguments in AoCalculator methods to prevent additional lookups
- Do not check for the axis aligned flag in AbstractQuadRenderer.shadeFlatQuad
- Respect cull parameter passed to non-terrain rendering by merging TerrainBlockRenderInfo into BlockRenderInfo
- Use reusable search pos when calling Block.shouldDrawSide to prevent additional BlockPos allocation
- Change BlockRenderContext.render and TerrainRenderContext.tessellateBlock to return void since return value is no longer used
- Remove QuadViewImpl.vertexStart since it is unused

* Add suggestions

- Mark Direction parameter to BlockRenderInfo.shouldDrawFace as Nullable
- Reuse MaterialFinder in FrameBakedModel

(cherry picked from commit 3a95925)

* Bump version

* Fix FabricMC#2925: deprecate item functions in BlockRenderLayerMap (FabricMC#2930)

(cherry picked from commit c2e6f67)
(cherry picked from commit 928d44d)

* Bump version

* Update et_ee.json (FabricMC#2894)

(cherry picked from commit 09aba06)

* Add 'Windswept Hills' biome convention tag (FabricMC#2878)

* add windswept biome tag

* change windswept tag to windswept hills

* list out biomes and revert name change

(cherry picked from commit 1b66477)

* Fixed end biome source injection (FabricMC#2940)

(cherry picked from commit 348a9c6)

(cherry picked from commit f1c68e5)

* EquipmentSlotProvider: Add javadoc link to getPreferredEquipmentSlot (FabricMC#2935)

(cherry picked from commit 09a3510)
(cherry picked from commit 71b8257)

* Conventional Biome Tags tweaks (FabricMC#2955)

* Birch Forest Tag FabricMC#2330

* Fix FabricMC#2649

* Run datagen

(cherry picked from commit 315602f)
(cherry picked from commit 521b5c5)

* Update pl_pl.json (FabricMC#2929)

(cherry picked from commit 36d2fcc)
(cherry picked from commit 8368a8b)

* Update ko_kr.json (FabricMC#2927) (FabricMC#2941)

* Update ko_kr.json

* fix typo

(cherry picked from commit 930b8d4)
(cherry picked from commit eeb6cf3)

* Create zh_cn.json (FabricMC#2945)

(cherry picked from commit 9af20fd)
(cherry picked from commit 93582b9)

* Fix Programmer Art resource pack injection support (FabricMC#2956)

* Bump version

---------

Co-authored-by: PepperCode1 <[email protected]>
Co-authored-by: modmuss50 <[email protected]>
Co-authored-by: Technici4n <[email protected]>
Co-authored-by: Madis Otenurm <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: TelepathicGrunt <[email protected]>
Co-authored-by: Juuz <[email protected]>
Co-authored-by: Maity <[email protected]>
Co-authored-by: Yoosk <[email protected]>
Co-authored-by: Alpha <[email protected]>
Co-authored-by: RawDiamondMC <[email protected]>
Co-authored-by: Julian Burner <[email protected]>
Co-authored-by: Amirhan-Taipovjan-Greatest-I <[email protected]>
@Technici4n Technici4n mentioned this pull request May 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request priority:low Low priority PRs that don't immediately need to be resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants