Skip to content

Commit f5da392

Browse files
gabizougabizou
committed
chore(git): merge upstream changes
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
2 parents df98cd6 + 0469dc9 commit f5da392

3 files changed

Lines changed: 53 additions & 2 deletions

File tree

‎forge/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ name=SpongeForge
22
implementation=Forge
33
description=The SpongeAPI implementation for MinecraftForge
44

5-
forgeVersion=63.0.0
5+
forgeVersion=64.0.1
66
mixinConfigs=mixins.spongeforge.accessors.json,mixins.spongeforge.api.json,mixins.spongeforge.inventory.json,mixins.spongeforge.inventory.shared.json,mixins.spongeforge.core.json,mixins.spongeforge.core.shared.json,mixins.spongeforge.tracker.json

‎gradle/verification-metadata.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5249,6 +5249,11 @@
52495249
<sha256 value="016ddccc64534aa706eb3501f2de81753c77e08ec3c8975506388907353d03d4" origin="Generated by Gradle"/>
52505250
</artifact>
52515251
</component>
5252+
<component group="net.minecraftforge" name="fmlcore" version="26.1.2-64.0.1">
5253+
<artifact name="fmlcore-26.1.2-64.0.1.jar">
5254+
<sha256 value="999fd3573eaef2a750852e651d2c7a108e0efa8a4ce73705e62ab7f5f490189e" origin="Generated by Gradle"/>
5255+
</artifact>
5256+
</component>
52525257
<component group="net.minecraftforge" name="fmlearlydisplay" version="1.20.4-49.0.38">
52535258
<artifact name="fmlearlydisplay-1.20.4-49.0.38.jar">
52545259
<sha256 value="93f12d9140f63c6371f35f89a2081490cf895dc30926e06d1883a860cb00d6be" origin="Generated by Gradle"/>
@@ -5438,6 +5443,11 @@
54385443
<sha256 value="107786a397fa4b5133dd86600a3c3e7336bcd35f6bd6dbe3108c794c01af7066" origin="Generated by Gradle"/>
54395444
</artifact>
54405445
</component>
5446+
<component group="net.minecraftforge" name="fmlearlydisplay" version="26.1.2-64.0.1">
5447+
<artifact name="fmlearlydisplay-26.1.2-64.0.1.jar">
5448+
<sha256 value="3eaf629c995f98ba67d8641e5d6539a355ecf6ecdf3dcd6d4c2704a249f03966" origin="Generated by Gradle"/>
5449+
</artifact>
5450+
</component>
54415451
<component group="net.minecraftforge" name="fmlloader" version="1.20.4-49.0.38">
54425452
<artifact name="fmlloader-1.20.4-49.0.38.jar">
54435453
<sha256 value="038956f20251656f44a0d50aebe4eca7b18437bea88908c4bd2db77166fb0594" origin="Generated by Gradle"/>
@@ -5627,6 +5637,11 @@
56275637
<sha256 value="46444a9681a8a345e3a81b602bb3d15462fc7fefedb227225d73968de07b8403" origin="Generated by Gradle"/>
56285638
</artifact>
56295639
</component>
5640+
<component group="net.minecraftforge" name="fmlloader" version="26.1.2-64.0.1">
5641+
<artifact name="fmlloader-26.1.2-64.0.1.jar">
5642+
<sha256 value="54d94085dfdc817c5d43282f35070c43f1f3afbf39bfb2365d6db7f0c4f56925" origin="Generated by Gradle"/>
5643+
</artifact>
5644+
</component>
56305645
<component group="net.minecraftforge" name="forge" version="1.20.4-49.0.38">
56315646
<artifact name="forge-1.20.4-49.0.38-installer.jar">
56325647
<sha256 value="7781ceff8a8afea8a33705ee35775c8278951a1020a667370a8df4d423ea719e" origin="Generated by Gradle"/>
@@ -5800,6 +5815,11 @@
58005815
<sha256 value="62d1c371233a8d5630f154f3b2ec121d1011f9194ca924b08f3b5377a754919e" origin="Generated by Gradle"/>
58015816
</artifact>
58025817
</component>
5818+
<component group="net.minecraftforge" name="forge-transformers" version="26.1.2-64.0.1">
5819+
<artifact name="forge-transformers-26.1.2-64.0.1.jar">
5820+
<sha256 value="403c9b760cb8c550b0e049be7a737f18d326334381063a4ebd556915adc2d03e" origin="Generated by Gradle"/>
5821+
</artifact>
5822+
</component>
58035823
<component group="net.minecraftforge" name="forgegradle" version="7.0.17">
58045824
<artifact name="forgegradle-7.0.17.jar">
58055825
<sha256 value="bf7c833bc1bac6fe896ad2c01d47d3e1586605eba04d946d3d4292e30b0d86c8" origin="Generated by Gradle"/>
@@ -6034,6 +6054,11 @@
60346054
<sha256 value="5ae82e30c7aa1507ae4fda56ff64c46c30e62f318ac3b5ed9c55c4ec7acb8882" origin="Generated by Gradle"/>
60356055
</artifact>
60366056
</component>
6057+
<component group="net.minecraftforge" name="javafmllanguage" version="26.1.2-64.0.1">
6058+
<artifact name="javafmllanguage-26.1.2-64.0.1.jar">
6059+
<sha256 value="811a9a2e516ce68085195a51065696986f5c02abba51ca193c2dd3255f302f8c" origin="Generated by Gradle"/>
6060+
</artifact>
6061+
</component>
60376062
<component group="net.minecraftforge" name="lowcodelanguage" version="1.20.4-49.0.38">
60386063
<artifact name="lowcodelanguage-1.20.4-49.0.38.jar">
60396064
<sha256 value="3d2afae5f4f287fcaa986ac9a773914768e1494e4f30c2d525a11f8452334e1a" origin="Generated by Gradle"/>
@@ -6231,6 +6256,11 @@
62316256
<sha256 value="4b87ca7f6e5b716c1a3b2f04187491695f7da2e1031dc063521414a6f129c6fb" origin="Generated by Gradle"/>
62326257
</artifact>
62336258
</component>
6259+
<component group="net.minecraftforge" name="lowcodelanguage" version="26.1.2-64.0.1">
6260+
<artifact name="lowcodelanguage-26.1.2-64.0.1.jar">
6261+
<sha256 value="89a9e8d654eb3810a1dfde4c714ebe6eaae9dd6e6ec6ecd398bf9939dcb4f97d" origin="Generated by Gradle"/>
6262+
</artifact>
6263+
</component>
62346264
<component group="net.minecraftforge" name="mclanguage" version="1.20.4-49.0.38">
62356265
<artifact name="mclanguage-1.20.4-49.0.38.jar">
62366266
<sha256 value="f27a2497aedee2a786976f9b891f1893fbe1e96fa759a4a61800f3e5c5d77cc7" origin="Generated by Gradle"/>
@@ -6428,6 +6458,11 @@
64286458
<sha256 value="6e2a0b6968aaf00144ab22770e8305d8fa997811cd78693da57f59b27ca93460" origin="Generated by Gradle"/>
64296459
</artifact>
64306460
</component>
6461+
<component group="net.minecraftforge" name="mclanguage" version="26.1.2-64.0.1">
6462+
<artifact name="mclanguage-26.1.2-64.0.1.jar">
6463+
<sha256 value="baa3a31216ebf6ce7e1dd1a89dc58155f126286deec6ce8acc25c2242d633a9e" origin="Generated by Gradle"/>
6464+
</artifact>
6465+
</component>
64316466
<component group="net.minecraftforge" name="mergetool" version="1.1.7">
64326467
<artifact name="mergetool-1.1.7-fatjar.jar">
64336468
<sha256 value="2fbb74386cc9f9f4e816d2b5167ed9274c0864eae532d658e34587b2a47857e8" origin="Generated by Gradle"/>
@@ -7158,6 +7193,17 @@
71587193
<sha256 value="bb698900cb86639589a5d39c248d4c26a09b27640b58492480f21bd40d0da13a" origin="Generated by Gradle"/>
71597194
</artifact>
71607195
</component>
7196+
<component group="net.neoforged" name="neoforge" version="26.1.2.7-beta">
7197+
<artifact name="neoforge-26.1.2.7-beta-moddev-config.json">
7198+
<sha256 value="399298c47a856ec5195c2668de4ab23f4ba761cb79596f7dc5037afa266aab4c" origin="Generated by Gradle"/>
7199+
</artifact>
7200+
<artifact name="neoforge-26.1.2.7-beta-universal.jar">
7201+
<sha256 value="a4527b3f736f00a5fe6e1601823a8bb9d733fc795ad2119a6bbd0caecb3ebdc4" origin="Generated by Gradle"/>
7202+
</artifact>
7203+
<artifact name="neoforge-26.1.2.7-beta-userdev.jar">
7204+
<sha256 value="0b23893464691ad3c0bef4e95d43476ac1a659ac1ce10a393ae82987c97a6d5a" origin="Generated by Gradle"/>
7205+
</artifact>
7206+
</component>
71617207
<component group="net.neoforged" name="neoform" version="1.21.10-20251007.142004">
71627208
<artifact name="neoform-1.21.10-20251007.142004.module">
71637209
<sha256 value="c4691930bbef5e3acc9b67a185810360abb0bc0de86d394fce537e2ece0d8634" origin="Generated by Gradle"/>
@@ -7192,6 +7238,11 @@
71927238
<sha256 value="c89f910127a0fa99d4e658c2cbc493c8861eea8b10c06cecce15cb45a86dce4b" origin="Generated by Gradle"/>
71937239
</artifact>
71947240
</component>
7241+
<component group="net.neoforged" name="neoform" version="26.1.2-1">
7242+
<artifact name="neoform-26.1.2-1.zip">
7243+
<sha256 value="3eb9f8cc282badfbc210a27a8304f14cc58fa40401a94072874dfaded3c8cb52" origin="Generated by Gradle"/>
7244+
</artifact>
7245+
</component>
71957246
<component group="net.neoforged" name="neoform-runtime" version="1.0.13">
71967247
<artifact name="neoform-runtime-1.0.13-all.jar">
71977248
<sha256 value="e435b9b38c364fc8be474dcfe4ccd4f3aed762bbfff26dcbf9312105ccf453ba" origin="Generated by Gradle"/>

‎neoforge/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ name=SpongeNeo
22
implementation=NeoForge
33
description=The SpongeAPI implementation for NeoForge
44

5-
neoForgeVersion=26.1.1.1-beta
5+
neoForgeVersion=26.1.2.7-beta
66
mixinConfigs=mixins.spongeneo.accessors.json,mixins.spongeneo.api.json,mixins.spongeneo.inventory.json,mixins.spongeneo.core.json,mixins.spongeneo.tracker.json

0 commit comments

Comments
 (0)