diff --git a/Phosphophyllite b/Phosphophyllite index c2408127..e0a3cc60 160000 --- a/Phosphophyllite +++ b/Phosphophyllite @@ -1 +1 @@ -Subproject commit c2408127a9c2db48f1f154ad32b486122871bbc1 +Subproject commit e0a3cc60740751105420a570e9aa4b5deaf85a75 diff --git a/Quartz b/Quartz index 70ce2c7b..27d9b244 160000 --- a/Quartz +++ b/Quartz @@ -1 +1 @@ -Subproject commit 70ce2c7b431ccee05ba760a6dec976d42e7f9660 +Subproject commit 27d9b244859b9d0ca9ad51099a50c38df75d1500 diff --git a/changelog.md b/changelog.md index 6e8fc2fd..4b68ef86 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,22 @@ +# 1.20.1-0.6.0-beta.10 + +## Reactor + - ported to new multiblock system + - power tap energy handling updated + - fix manifolds being ignored in a passive reactor + +## Turbine + - ported to new multiblock system + - power tap energy handling updated + - fix coil/blade validation bug + +## Heat Exchanger + - ported to new multiblock system + - channels rendered with quartz, reduces hitches when placing/removing blocks in renderchunks containing lots of them + +## Misc + - JEI integration is back, and works in multiplayer too + # 1.19.2-0.6.0-beta.6.1 ## Reactor diff --git a/gradle.properties b/gradle.properties index 008fbd73..666b454d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ jei_mc_version=1.20.1 jei_version=15.2.0.22 majorVersion=0 -minorVersion=7 +minorVersion=6 patchVersion=0 -postfixVersion=alpha \ No newline at end of file +postfixVersion=beta.10 \ No newline at end of file