Commit 9d876b2
committed
Merge remote-tracking branch 'refs/remotes/origin/upstream/1.21.1' into dev/1.21.10
# Conflicts:
# .github/workflows/build.yml
# .github/workflows/release.yml
# buildSrc/build.gradle.kts
# fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/custom/ApiLookupMapImpl.java
# fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json
# fabric-blockrenderlayer-v1/src/client/java/net/fabricmc/fabric/impl/blockrenderlayer/BlockRenderLayerMapImpl.java
# fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java
# fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
# fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java
# fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
# fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
# fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/quartz.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json
# fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json
# fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java
# fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java
# fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
# fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/ko_kr.json
# fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java
# fabric-data-attachment-api-v1/build.gradle
# fabric-data-attachment-api-v1/src/client/resources/fabric-data-attachment-api-v1.client.mixins.json
# fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentRegistry.java
# fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentType.java
# fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentEntrypoint.java
# fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentRegistryImpl.java
# fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/IAttachmentHolderMixin.java
# fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WorldChunkMixin.java
# fabric-data-attachment-api-v1/src/main/resources/fabric-data-attachment-api-v1.mixins.json
# fabric-data-attachment-api-v1/src/main/resources/fabric.mod.json
# fabric-data-attachment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/AttachmentTestMod.java
# fabric-data-attachment-api-v1/src/testmod/resources/fabric.mod.json
# fabric-lifecycle-events-v1/README.md
# fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/MinecraftClientMixin.java
# fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java
# fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelLoaderMixin.java
# fabric-model-loading-api-v1/src/client/resources/fabric-model-loading-api-v1.mixins.json
# fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java
# fabric-networking-api-v1/src/client/java/org/sinytra/fabric/networking_api/client/NeoClientPlayNetworking.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AttachmentTargetImpl.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/FabricRegistryByteBuf.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentChange.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentSync.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentSyncException.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentTargetInfo.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/SupportedAttachmentsClientConnection.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/c2s/AcceptedAttachmentsPayloadC2S.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/s2c/AttachmentSyncPayloadS2C.java
# fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/s2c/RequestAcceptedAttachmentsPayloadS2C.java
# fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java
# fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java
# fabric-renderer-indigo/src/client/resources/fabric.mod.json
# fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ArmorRendererRegistryImpl.java
# fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockEntityRendererRegistryImpl.java
# fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/EntityModelLayerImpl.java
# fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ArmorFeatureRendererMixin.java
# fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/BlockColorsMixin.java
# fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ItemColorsMixin.java
# fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json
# fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java
# fabric-screen-api-v1/src/client/resources/fabric-screen-api-v1.mixins.json
# fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/WaterPotionStorage.java
# fabric-transfer-api-v1/src/main/java/org/sinytra/fabric/transfer_api/compat/FluidStorageFluidHandler.java
# fabric-transfer-api-v1/src/main/java/org/sinytra/fabric/transfer_api/compat/ItemStorageItemHandler.java
# fabric-transfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/FluidItemTests.java
# fabric-transitive-access-wideners-v1/build.gradle
# fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener
# ffapi.gradle.properties
# gradle.properties
# gradle/wrapper/gradle-wrapper.propertiesFile tree
155 files changed
+2929
-21
lines changed- .github
- ISSUE_TEMPLATE
- workflows
- fabric-convention-tags-v2/src/generated/resources/data/c/tags
- block
- chests
- cobblestones
- fence_gates
- fences
- ore_bearing_ground
- ore_rates
- ores_in_ground
- ores
- pumpkins
- sands
- item
- chests
- cobblestones
- drink_containing
- drinks
- fence_gates
- fences
- ore_bearing_ground
- ore_rates
- ores_in_ground
- ores
- potions
- pumpkins
- sands
- seeds
- worldgen/biome
- is_cold
- is_dense_vegetation
- is_hot
- is_sparse_vegetation
- is_temperate
- is_wet
- fabric-data-attachment-api-v1/src
- client/java/net/fabricmc/fabric/impl/attachment/client
- main
- java/net/fabricmc/fabric
- api/attachment/v1
- mixin/attachment
- resources/assets/fabric-data-attachment-api-v1/lang
- testmodClient
- java/net/fabricmc/fabric/test/attachment/client
- mixin
- resources
- fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/api/client/event/lifecycle/v1
- fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading
- fabric-networking-api-v1/src
- client/java/net/fabricmc/fabric/mixin/networking/client
- main/java
- net/fabricmc/fabric/impl/networking
- sync
- s2c
- org/sinytra/fabric/networking_api
- fabric-registry-sync-v0/src/test/java/net/fabricmc/fabric/test/registry/sync
- fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering
- gradle/wrapper
- src/main/resources
- META-INF
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
155 files changed
+2929
-21
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | | - | |
8 | | - | |
| 7 | + | |
| 8 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
206 | 206 | | |
207 | 207 | | |
208 | 208 | | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
209 | 217 | | |
210 | 218 | | |
211 | 219 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
0 commit comments