Skip to content

Commit 669b992

Browse files
committed
Merge remote-tracking branch 'origin/pc_26_1' into feature/26.1-compat
2 parents 97dce3f + d46ddc2 commit 669b992

7 files changed

Lines changed: 15582 additions & 3 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Language independent module providing minecraft data for minecraft clients, serv
99

1010
Supports
1111
* Minecraft PC version 0.30c (classic), 1.7.10, 1.8.8, 1.9 (15w40b, 1.9, 1.9.1-pre2, 1.9.2, 1.9.4),
12-
1.10 (16w20a, 1.10-pre1, 1.10, 1.10.1, 1.10.2), 1.11 (16w35a, 1.11, 1.11.2), 1.12 (17w15a, 17w18b, 1.12-pre4, 1.12, 1.12.1, 1.12.2), 1.13 (17w50a, 1.13, 1.13.1, 1.13.2-pre1, 1.13.2-pre2, 1.13.2), 1.14 (1.14, 1.14.1, 1.14.3, 1.14.4), 1.15 (1.15, 1.15.1, 1.15.2), 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17, 1.17.1, 1.18 (1.18, 1.18.1, 1.18.2), 1.19 (1.19, 1.19.2, 1.19.3, 1.19.4), 1.20 (1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6), 1.21 (1.21, 1.21.1, 1.21.3), 1.21.8, 1.21.9, 1.21.10
12+
1.10 (16w20a, 1.10-pre1, 1.10, 1.10.1, 1.10.2), 1.11 (16w35a, 1.11, 1.11.2), 1.12 (17w15a, 17w18b, 1.12-pre4, 1.12, 1.12.1, 1.12.2), 1.13 (17w50a, 1.13, 1.13.1, 1.13.2-pre1, 1.13.2-pre2, 1.13.2), 1.14 (1.14, 1.14.1, 1.14.3, 1.14.4), 1.15 (1.15, 1.15.1, 1.15.2), 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17, 1.17.1, 1.18 (1.18, 1.18.1, 1.18.2), 1.19 (1.19, 1.19.2, 1.19.3, 1.19.4), 1.20 (1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6), 1.21 (1.21, 1.21.1, 1.21.3), 1.21.8, 1.21.9, 1.21.10, 26.1
1313
<!--NEXT PC-->
1414
* Minecraft bedrock version 0.14, 0.15, 1.0, 1.16.201, 1.16.210, 1.16.220, 1.17.0, 1.17.10, 1.17.30, 1.17.40, 1.18.0, 1.18.11, 1.18.30, 1.19.1, 1.19.10, 1.19.20, 1.19.21, 1.19.30, 1.19.40, 1.19.50, 1.19.60, 1.19.62, 1.19.63, 1.19.70, 1.19.80, 1.20.0, 1.20.10, 1.20.30, 1.20.40, 1.20.50, 1.20.61, 1.20.71, 1.20.80, 1.21.0, 1.21.2, 1.21.20, 1.21.30, 1.21.42, 1.21.50, 1.21.60, 1.21.70, 1.21.80, 1.21.90, 1.21.93, 1.21.100, 1.21.111, 1.21.120, 1.21.124, 1.21.130, 1.26.0, 26.10
1515
<!--NEXT BEDROCK-->

data/dataPaths.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,6 +1718,33 @@
17181718
"tints": "pc/1.21.11",
17191719
"version": "pc/1.21.11",
17201720
"windows": "pc/1.16.1",
1721+
"proto": "pc/1.21.11"
1722+
},
1723+
"26.1": {
1724+
"attributes": "pc/1.21.11",
1725+
"blockCollisionShapes": "pc/1.21.11",
1726+
"blocks": "pc/1.21.11",
1727+
"blockLoot": "pc/1.20",
1728+
"biomes": "pc/1.21.11",
1729+
"commands": "pc/1.20.3",
1730+
"effects": "pc/1.21.11",
1731+
"enchantments": "pc/1.21.11",
1732+
"entities": "pc/1.21.11",
1733+
"entityLoot": "pc/1.20",
1734+
"foods": "pc/1.21.11",
1735+
"instruments": "pc/1.21.11",
1736+
"items": "pc/1.21.11",
1737+
"language": "pc/1.21.11",
1738+
"loginPacket": "pc/1.21.11",
1739+
"mapIcons": "pc/1.20.2",
1740+
"materials": "pc/1.21.11",
1741+
"particles": "pc/1.21.11",
1742+
"protocol": "pc/26.1",
1743+
"recipes": "pc/1.21.11",
1744+
"sounds": "pc/1.21.11",
1745+
"tints": "pc/1.21.11",
1746+
"version": "pc/26.1",
1747+
"windows": "pc/1.16.1",
17211748
"proto": "pc/latest"
17221749
}
17231750
},

0 commit comments

Comments
 (0)