diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d9c378..6c62ad8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,13 @@ -2.23.0+242 +2.24.0+244 -• add mod AE2 Utilities -• add mod Mixin Booter - -• update mod Combo Armors +• update mod Custom Loading Screen • update mod Dimensional Doors • update mod Energy Control -• update mod Floralis -• update mod Hammer Lib -• update mod Myst Library -• update mod Not Enough Energistics - -• add config Agricraft +• update mod Foam Fix +• update mod Mixin Booter +• update config Custom Loading Screen • update config Custom Main Menu +• update config Dimensional Doors • update config Energy Control -• update config Not Enough Energistics +• update config Foam Fix diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index 73c5cbe..b821c48 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -113,7 +113,7 @@ "modcounts": { - "text" : "MC 1.12.2 - ET 2.23.0+242. 175 modifications.", + "text" : "MC 1.12.2 - ET 2.24.0+244. 175 modifications.", "posX" : 2, "posY" : -10, "color" : -1, diff --git a/config/customloadingscreen_timings.nbt b/config/customloadingscreen_timings.nbt index f623cca..9b03ddf 100644 Binary files a/config/customloadingscreen_timings.nbt and b/config/customloadingscreen_timings.nbt differ diff --git a/config/dimdoors.cfg b/config/dimdoors.cfg index 7971fc8..31b1241 100644 --- a/config/dimdoors.cfg +++ b/config/dimdoors.cfg @@ -12,9 +12,6 @@ general { B:closeDoorBehind=true I:depthSpreadFactor=20 B:riftBoundingBoxInCreative=false - - # Min: 0.0 - # Max: 1.7976931348623157E308 D:riftCloseSpeed=1.0 # Min: 0.0 @@ -42,6 +39,9 @@ graphics { limbo { + S:blockLimboDecayBlackList < + > + B:enableLimboDecay=true B:hardcoreLimbo=false B:universalLimbo=false } @@ -75,6 +75,21 @@ pockets { } +rifts { + S:blockRiftDecayBlackList < + > + B:enableRiftDecay=true + B:enableRiftDecayDropsWorldThread=true + B:enableRifts=true + I:maxRiftSize=-1 + B:riftBoundingBoxInCreative=false + + # Min: 0.0 + # Max: 1.7976931348623157E308 + D:riftCloseSpeed=1.0 +} + + world { I:clusterDimBlacklist < > diff --git a/config/energycontrol.cfg b/config/energycontrol.cfg index 1928062..2f8cb6e 100644 --- a/config/energycontrol.cfg +++ b/config/energycontrol.cfg @@ -34,6 +34,16 @@ general { I:wsRefreshRate=100 S:wsServerID=d730ef1e-68a2-4fc9-aa82-42edcd95aae0 S:wsToken=78c2b80a-1203-43fd-a9af-75cec29f5acf + + websocket { + B:wsEnabled=false + S:wsHost= + I:wsPort=0 + I:wsRefreshRate=100 + S:wsServerID=c76c9593-f887-493c-b966-9a4fd1f65ba9 + S:wsToken=78c2b80a-1203-43fd-a9af-75cec29f5acf + } + } diff --git a/config/foamfix.cfg b/config/foamfix.cfg index b131e62..4e002a0 100644 --- a/config/foamfix.cfg +++ b/config/foamfix.cfg @@ -34,9 +34,13 @@ client { # Faster/less memory-churning construction mechanism for ModelResourceLocation objects. Identified by malte0811 in FerriteCore - implemented in a distinct way. [default: true] B:modelResourceLocationFastConstruct=true - # More optimized multipart model condition storage. Inspired by malte0811's research. [default: true] + # Fix opening URLs on Linux-based installs. [default: true] + B:openUrlLinux=true B:smallModelConditions=true + # More optimized multipart model condition storage. Inspired by malte0811's research. Now not broken! [default: true] + B:smallModelConditionsV2=true + # Wipes the IModel cache after baking is finished. Saves a lot of RAM, as most IModels will not be reloaded. [default: true] B:wipeModelCache=true } diff --git a/mods/!mixinbooter-4.2.jar b/mods/!mixinbooter-5.0.jar similarity index 88% rename from mods/!mixinbooter-4.2.jar rename to mods/!mixinbooter-5.0.jar index 837e9e2..146c372 100644 Binary files a/mods/!mixinbooter-4.2.jar and b/mods/!mixinbooter-5.0.jar differ diff --git a/mods/DimensionalDoors-3.0.9-288.jar b/mods/DimensionalDoors-1.12.2-3.0.12.jar similarity index 92% rename from mods/DimensionalDoors-3.0.9-288.jar rename to mods/DimensionalDoors-1.12.2-3.0.12.jar index 0f9a958..2f4f482 100644 Binary files a/mods/DimensionalDoors-3.0.9-288.jar and b/mods/DimensionalDoors-1.12.2-3.0.12.jar differ diff --git a/mods/EnergyControl-1.12.2-0.2.8.jar b/mods/EnergyControl-1.12.2-0.2.8.jar deleted file mode 100644 index 0eba32c..0000000 Binary files a/mods/EnergyControl-1.12.2-0.2.8.jar and /dev/null differ diff --git a/mods/EnergyControl-1.12.2-0.3.1.jar b/mods/EnergyControl-1.12.2-0.3.1.jar new file mode 100644 index 0000000..cec578c Binary files /dev/null and b/mods/EnergyControl-1.12.2-0.3.1.jar differ diff --git a/mods/LoadingScreen-1.12.2-1.5.6.jar b/mods/LoadingScreen-1.12.2-1.5.7.jar similarity index 87% rename from mods/LoadingScreen-1.12.2-1.5.6.jar rename to mods/LoadingScreen-1.12.2-1.5.7.jar index 693d8a7..6b72305 100644 Binary files a/mods/LoadingScreen-1.12.2-1.5.6.jar and b/mods/LoadingScreen-1.12.2-1.5.7.jar differ diff --git a/mods/foamfix-0.10.14-1.12.2.jar b/mods/foamfix-0.10.14-1.12.2.jar deleted file mode 100644 index 09878f1..0000000 Binary files a/mods/foamfix-0.10.14-1.12.2.jar and /dev/null differ diff --git a/mods/foamfix-0.10.15-1.12.2.jar b/mods/foamfix-0.10.15-1.12.2.jar new file mode 100644 index 0000000..ecc2f49 Binary files /dev/null and b/mods/foamfix-0.10.15-1.12.2.jar differ