sync 1.19.2 to 0.76.0 #90
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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)
…abricMC#2930) (cherry picked from commit c2e6f67) (cherry picked from commit 928d44d)
(cherry picked from commit 09aba06)
* add windswept biome tag * change windswept tag to windswept hills * list out biomes and revert name change (cherry picked from commit 1b66477)
…abricMC#2935) (cherry picked from commit 09a3510) (cherry picked from commit 71b8257)
* Birch Forest Tag FabricMC#2330 * Fix FabricMC#2649 * Run datagen (cherry picked from commit 315602f) (cherry picked from commit 521b5c5)
# Conflicts: # fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/TheEndBiomeSourceMixin.java # fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackUtil.java # fabric-resource-loader-v0/src/main/resources/assets/quilted_fabric_resource_loader_v0/lang/zh_cn.json # gradle.properties
EnnuiL
approved these changes
Mar 26, 2023
|
not sure fixing licenses for older versions is worth it :p |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
was a simple merge, all tests pass! (well, except the recipe remainder one that's been broken for a while)