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.

Sign up for GitHub

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

sync 1.19.2 to 0.76.0 #90

Merged
merged 15 commits into from
Mar 26, 2023
Merged

sync 1.19.2 to 0.76.0 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1adbf27
Indigo shade related fixes and other changes (#2898)
PepperCode1 Feb 23, 2023
e500c17
Bump version
modmuss50 Feb 23, 2023
cafc6e8
Fix #2925: deprecate item functions in BlockRenderLayerMap (#2930)
Technici4n Feb 24, 2023
cb8186d
Bump version
modmuss50 Feb 24, 2023
e960d55
Update et_ee.json (#2894)
Madis0 Mar 15, 2023
68a2050
Add 'Windswept Hills' biome convention tag (#2878)
TheDeathlyCow Mar 15, 2023
16f1e31
Fixed end biome source injection (#2940)
TelepathicGrunt Mar 15, 2023
b7d1888
EquipmentSlotProvider: Add javadoc link to getPreferredEquipmentSlot …
Juuxel Mar 15, 2023
4bc6e26
Conventional Biome Tags tweaks (#2955)
maityyy Mar 15, 2023
1e4447c
Update pl_pl.json (#2929)
Yoosk Mar 15, 2023
dd83229
Update ko_kr.json (#2927) (#2941)
AlphaKR93 Mar 15, 2023
b643d3a
Create zh_cn.json (#2945)
RawDiamondMC Mar 15, 2023
edbdcdd
Fix Programmer Art resource pack injection support (#2956)
NebelNidas Mar 15, 2023
982df14
Bump version
Amirhan-Taipovjan-Greatest-I Mar 15, 2023
5e0cf8d
Merge remote-tracking branch 'fabricmc/1.19.2' into 1.19.2
ix0rai Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ private void generateCategoryTags() {
getOrCreateTagBuilder(ConventionalBiomeTags.EXTREME_HILLS)
.add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS)
.add(BiomeKeys.WINDSWEPT_HILLS);
getOrCreateTagBuilder(ConventionalBiomeTags.WINDSWEPT)
.add(BiomeKeys.WINDSWEPT_HILLS)
.add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS)
.add(BiomeKeys.WINDSWEPT_FOREST)
.add(BiomeKeys.WINDSWEPT_SAVANNA);
getOrCreateTagBuilder(ConventionalBiomeTags.JUNGLE)
.addOptionalTag(BiomeTags.IS_JUNGLE);
getOrCreateTagBuilder(ConventionalBiomeTags.MESA)
Expand Down Expand Up @@ -119,6 +124,9 @@ private void generateCategoryTags() {
.add(BiomeKeys.STONY_SHORE);
getOrCreateTagBuilder(ConventionalBiomeTags.FOREST)
.addOptionalTag(BiomeTags.IS_FOREST);
getOrCreateTagBuilder(ConventionalBiomeTags.BIRCH_FOREST)
.add(BiomeKeys.BIRCH_FOREST)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST);
getOrCreateTagBuilder(ConventionalBiomeTags.OCEAN)
.addOptionalTag(ConventionalBiomeTags.DEEP_OCEAN)
.addOptionalTag(ConventionalBiomeTags.SHALLOW_OCEAN)
Expand Down Expand Up @@ -163,6 +171,7 @@ private void generateOtherBiomeTypes() {

private void generateClimateAndVegetationTags() {
getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_COLD)
.add(BiomeKeys.SNOWY_PLAINS)
.add(BiomeKeys.GROVE)
.add(BiomeKeys.JAGGED_PEAKS)
.add(BiomeKeys.TAIGA).add(BiomeKeys.SNOWY_TAIGA)
Expand Down
7 changes: 7 additions & 0 deletions ...c-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/birch_forest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"minecraft:birch_forest",
"minecraft:old_growth_birch_forest"
]
}
1 change: 1 addition & 0 deletions ...c-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/climate_cold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"replace": false,
"values": [
"minecraft:snowy_plains",
"minecraft:grove",
"minecraft:jagged_peaks",
"minecraft:taiga",
Expand Down
9 changes: 9 additions & 0 deletions fabric-convention-tags-v1/src/generated/resources/data/c/tags/worldgen/biome/windswept.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"replace": false,
"values": [
"minecraft:windswept_hills",
"minecraft:windswept_gravelly_hills",
"minecraft:windswept_forest",
"minecraft:windswept_savanna"
]
}
2 changes: 2 additions & 0 deletions ...ags-v1/src/main/java/net/fabricmc/fabric/api/tag/convention/v1/ConventionalBiomeTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ private ConventionalBiomeTags() {
public static final TagKey<Biome> IN_NETHER = register("in_nether");
public static final TagKey<Biome> TAIGA = register("taiga");
public static final TagKey<Biome> EXTREME_HILLS = register("extreme_hills");
public static final TagKey<Biome> WINDSWEPT = register("windswept");
public static final TagKey<Biome> JUNGLE = register("jungle");
public static final TagKey<Biome> MESA = register("mesa");
/**
Expand All @@ -73,6 +74,7 @@ private ConventionalBiomeTags() {
* Biomes densely populated with deciduous trees.
*/
public static final TagKey<Biome> FOREST = register("forest");
public static final TagKey<Biome> BIRCH_FOREST = register("birch_forest");
public static final TagKey<Biome> OCEAN = register("ocean");
public static final TagKey<Biome> DESERT = register("desert");
public static final TagKey<Biome> RIVER = register("river");
Expand Down
3 changes: 3 additions & 0 deletions fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/EquipmentSlotProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
* This can be used to give non-armor items, such as blocks,
* an armor slot that they can go in.
*
* <p>The preferred requipment slot of an item stack can be queried using
* {@link net.minecraft.entity.LivingEntity#getPreferredEquipmentSlot(ItemStack) LivingEntity.getPreferredEquipmentSlot()}.
*
* <p>Equipment slot providers can be set with {@link FabricItemSettings#equipmentSlot(EquipmentSlotProvider)}.
*
* <p>Note that items extending {@link net.minecraft.item.ArmorItem} don't need to use this
Expand Down
4 changes: 3 additions & 1 deletion ...rce-loader-v0/src/main/resources/assets/quilted_fabric_resource_loader_v0/lang/et_ee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"pack.source.fabricmod": "Fabricu mod",
"pack.source.builtinMod": "sisseeh.: %s"
"pack.source.builtinMod": "sisseeh.: %s",
"pack.name.fabricMod": "Fabricu mod \"%s\"",
"pack.name.fabricMods": "Fabricu modid"
}
5 changes: 4 additions & 1 deletion ...rce-loader-v0/src/main/resources/assets/quilted_fabric_resource_loader_v0/lang/ko_kr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"pack.description.modResources": "모드 리소스.",
"pack.source.fabricmod": "Fabric 모드",
"pack.source.builtinMod": "%s에 내장"
"pack.source.builtinMod": "%s 에 내장됨",
"pack.name.fabricMod": "\"%s\" Fabric 모드",
"pack.name.fabricMods": "Fabric 모드"
}
5 changes: 4 additions & 1 deletion ...rce-loader-v0/src/main/resources/assets/quilted_fabric_resource_loader_v0/lang/pl_pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"pack.description.modResources": "Zasoby modów.",
"pack.source.fabricmod": "Mod Fabric",
"pack.source.builtinMod": "wbudowana: %s"
"pack.source.builtinMod": "wbudowana: %s",
"pack.name.fabricMod": "Mod Fabric \"%s\"",
"pack.name.fabricMods": "Mody Fabric"
}
7 changes: 7 additions & 0 deletions ...rce-loader-v0/src/main/resources/assets/quilted_fabric_resource_loader_v0/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"pack.description.modResources": "模组资源。",
"pack.source.fabricmod": "Fabric 模组",
"pack.source.builtinMod": "内置: %s",
"pack.name.fabricMod": "Fabric 模组 \"%s\"",
"pack.name.fabricMods": "Fabric 模组"
}
28 changes: 14 additions & 14 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.parallel=true

archivesBaseName=quilted_fabric_api
version=4.0.0-beta.29
upstream_version=0.75.1
upstream_version=0.76.0
minecraft_version=1.19.2
yarn_version=+build.17
loader_version=0.18.2
Expand All @@ -14,35 +14,35 @@ prerelease=true
# The upstream version list. Each quilted module should aim to be compatible with them
fabric-api-base-version=0.4.15
fabric-api-lookup-api-v1-version=1.6.14
fabric-biome-api-v1-version=9.1.0
fabric-biome-api-v1-version=9.1.1
fabric-block-api-v1-version=1.0.2
fabric-blockrenderlayer-v1-version=1.1.25
fabric-command-api-v1-version=1.2.16
fabric-command-api-v2-version=2.2.1
fabric-commands-v0-version=0.2.33
fabric-containers-v0-version=0.1.41
fabric-content-registries-v0-version=3.5.1
fabric-content-registries-v0-version=3.5.2
fabric-crash-report-info-v1-version=0.2.8
fabric-data-generation-api-v1-version=5.3.7
fabric-data-generation-api-v1-version=5.3.8
fabric-dimensions-v1-version=2.1.35
fabric-entity-events-v1-version=1.5.4
fabric-events-interaction-v0-version=0.4.34
fabric-events-lifecycle-v0-version=0.2.35
fabric-events-lifecycle-v0-version=0.2.36
fabric-game-rule-api-v1-version=1.0.24
fabric-gametest-api-v1-version=1.1.7
fabric-item-api-v1-version=1.6.5
fabric-item-groups-v0-version=0.3.38
fabric-gametest-api-v1-version=1.1.8
fabric-item-api-v1-version=1.6.6
fabric-item-groups-v0-version=0.3.39
fabric-key-binding-api-v1-version=1.0.25
fabric-keybindings-v0-version=0.2.23
fabric-lifecycle-events-v1-version=2.2.4
fabric-loot-api-v2-version=1.1.12
fabric-loot-tables-v1-version=1.1.15
fabric-loot-api-v2-version=1.1.13
fabric-loot-tables-v1-version=1.1.16
fabric-message-api-v1-version=5.0.7
fabric-mining-level-api-v1-version=2.1.23
fabric-mining-level-api-v1-version=2.1.24
fabric-models-v0-version=0.3.21
fabric-networking-api-v1-version=1.2.11
fabric-networking-v0-version=0.3.28
fabric-object-builder-api-v1-version=4.2.1
fabric-object-builder-api-v1-version=4.2.2
fabric-particles-v1-version=1.0.14
fabric-recipe-api-v1-version=1.0.1
fabric-registry-sync-v0-version=0.9.32
Expand All @@ -54,12 +54,12 @@ fabric-rendering-fluids-v1-version=3.0.11
fabric-rendering-v0-version=1.1.27
fabric-rendering-v1-version=1.12.1
fabric-resource-conditions-api-v1-version=2.1.2
fabric-resource-loader-v0-version=0.8.3
fabric-resource-loader-v0-version=0.8.4
fabric-screen-api-v1-version=1.0.32
fabric-screen-handler-api-v1-version=1.3.7
fabric-sound-api-v1-version=1.0.2
fabric-textures-v0-version=1.0.24
fabric-transfer-api-v1-version=2.1.6
fabric-transitive-access-wideners-v1-version=1.3.3
fabric-convention-tags-v1-version=1.2.2
fabric-convention-tags-v1-version=1.3.0
fabric-client-tags-api-v1-version=1.0.5