Merge branch 'main' into beta-server

.forgejo/workflows/pages.yml

@@ -16,9 +16,11 @@ jobs:
           go-version: 'stable' # The Go version to download (if necessary) and use.
       - run: |
           mkdir /workspace/bin
+          mkdir TrotCraft/builds
           export GOBIN=/workspace/bin
           go install github.com/packwiz/packwiz@latest
           cd TrotCraft/client
+          /workspace/bin/packwiz mr export -o ../builds/TrotCraft-latest.mrpack
           /workspace/bin/packwiz refresh --build
           cd ../server
           /workspace/bin/packwiz refresh --build

README.md

@@ -1,3 +1,80 @@
 # TrotCraft
 
 the official TwitchTrot Minecraft modpack
+
+
+[includes](https://moddermore.net/list/y6yzMJs9YiJ8):
+
+- [**AppleSkin**](https://modrinth.com/mod/appleskin) - Food/hunger-related HUD improvements
+- [**BSL Shaders**](https://modrinth.com/mod/bsl-shaders) - Shaderpack for Minecraft: Java Edition. It's bright, colorful, and distinct.
+- [**Better Mount HUD**](https://modrinth.com/mod/better-mount-hud) - Improves the ingame HUD while riding a mount
+- [**Better Third Person**](https://modrinth.com/mod/better-third-person) - Improves third person camera view.
+- [**Big Pony**](https://modrinth.com/mod/big-pony) - Ah AM a big pony!
+- [**Bobby**](https://modrinth.com/mod/bobby) - Allows for render distances greater than the server's view-distance
+- [**Bookshelf**](https://modrinth.com/mod/bookshelf-lib) - An open source library for other mods!
+- [**CIT Resewn**](https://modrinth.com/mod/cit-resewn) - Re-implements MCPatcher's CIT (custom item textures from optifine resource packs)
+- [**Capes**](https://modrinth.com/mod/capes) - Lets you use capes from OptiFine, LabyMod and other cape mods
+- [**Chat Heads**](https://modrinth.com/mod/chat-heads) - See who you're chatting with!
+- [**Chat Reporting Helper**](https://modrinth.com/mod/chat-reporting-helper) - An educational tool that explains chat reporting in a simple and neutral way.
+- [**Cloth Config API**](https://modrinth.com/mod/cloth-config) - Configuration Library for Minecraft Mods
+- [**Complementary Shaders - Reimagined**](https://modrinth.com/mod/complementary-reimagined) - Preserving the elements of Minecraft with exceptional quality, detail, and performance.
+- [**Complementary Shaders - Unbound**](https://modrinth.com/mod/complementary-unbound) - Transforming the visuals of Minecraft with exceptional quality, detail, and performance.
+- [**Continuity**](https://modrinth.com/mod/continuity) - A Fabric mod that allows for efficient connected textures
+- [**Controlify**](https://modrinth.com/mod/controlify) - Adds the best controller support to Minecraft Java edition!
+- [**Cubes Without Borders**](https://modrinth.com/mod/cubes-without-borders) - A mod that allows you to play Minecraft in a borderless fullscreen window.
+- [**Debugify**](https://modrinth.com/mod/debugify) - Fixes Minecraft bugs found on the bug tracker
+- [**Dynamic FPS**](https://modrinth.com/mod/dynamic-fps) - Reduce resource usage while Minecraft is in the background or idle.
+- [**Enchantment Descriptions**](https://modrinth.com/mod/enchantment-descriptions) - Provides a way to get enchantment descriptions from enchanted books.
+- [**Enhanced Block Entities**](https://modrinth.com/mod/ebe) - Reduce FPS lag with block entities, as well as customize them with resource packs
+- [**Entity Culling**](https://modrinth.com/mod/entityculling) - Using async path-tracing to hide Block-/Entities that are not visible
+- [**Fabric API**](https://modrinth.com/mod/fabric-api) - Lightweight and modular API providing common hooks and intercompatibility measures utilized by mods using the Fabric toolchain.
+- [**Fabric Language Kotlin**](https://modrinth.com/mod/fabric-language-kotlin) - This is a mod that enables usage of the Kotlin programming language for Fabric mods.
+- [**FabricSkyBoxes Interop**](https://modrinth.com/mod/fabricskyboxes-interop) - FabricSkyBoxes Interoperability for MCPatcher/OptiFine Skies
+- [**FabricSkyboxes**](https://modrinth.com/mod/fabricskyboxes) - Allows resource packs to define custom skyboxes.
+- [**Fabrishot**](https://modrinth.com/mod/fabrishot) - Take insanely large screenshots because why not
+- [**Falling Leaves**](https://modrinth.com/mod/fallingleaves) - Adds a neat little particle effect to leaf blocks
+- [**Fast Better Grass**](https://modrinth.com/mod/fast-better-grass) - Makes grass and related blocks use the top texture on the sides. Works with other resource packs!
+- [**FastQuit**](https://modrinth.com/mod/fastquit) - Lets you return to the Title Screen early while your world is still saving in the background!
+- [**FerriteCore**](https://modrinth.com/mod/ferrite-core) - Memory usage optimizations
+- [**HD Skins**](https://modrinth.com/mod/hd-skins) - Custom skin servers with higher resolution
+- [**ImmediatelyFast**](https://modrinth.com/mod/immediatelyfast) - Speed up immediate mode rendering in Minecraft
+- [**Indium**](https://modrinth.com/mod/indium) - Sodium addon providing support for the Fabric Rendering API, based on Indigo
+- [**Iris Shaders**](https://modrinth.com/mod/iris) - A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs
+- [**Kirin**](https://modrinth.com/mod/kirin) - GUI Library for help with making minecraft screens more easily
+- [**LS RenderPearl**](https://modrinth.com/mod/ls-renderpearl) - Modern, lightweight shaders for Iris that attempt to improve the Vanilla aesthetic while maintaining great performance
+- [**LambDynamicLights**](https://modrinth.com/mod/lambdynamiclights) - A dynamic lights mod for Fabric.
+- [**Language Reload**](https://modrinth.com/mod/language-reload) - Reduces load times and adds fallbacks for languages
+- [**Lithium**](https://modrinth.com/mod/lithium) - No-compromises game logic/server optimization mod
+- [**MAmbience**](https://modrinth.com/mod/mambience) - MAmbience adds a large amount of dynamic ambient effects to minecraft. This includes ambient sounds, visual (particle based) and  advanced footstep sounds. All of this while remaining fully compatible with vanilla clients using a simple resourcepack.
+- [**Mine Little Pony**](https://modrinth.com/mod/mine-little-pony) - Turns players and mobs into ponies
+- [**MixinTrace**](https://modrinth.com/mod/mixintrace) - Adds a list of mixins in the stack trace to crash reports 
+- [**Mod Detection Preventer**](https://modrinth.com/mod/moddetectionpreventer) - Fixes a security vulnerability that allows servers to detect what mods you have installed.
+- [**Mod Menu**](https://modrinth.com/mod/modmenu) - Adds a mod menu to view the list of mods you have installed.
+- [**Model Gap Fix**](https://modrinth.com/mod/modelfix) - Fixes gaps in Block Models and Item Models
+- [**ModernFix**](https://modrinth.com/mod/modernfix) - All-in-one mod that improves performance, reduces memory usage, and fixes many bugs. Compatible with all your favorite performance mods!
+- [**More Chat History**](https://modrinth.com/mod/morechathistory) - Increases the maximum length of chat history.
+- [**More Culling**](https://modrinth.com/mod/moreculling) - A mod that changes how multiple types of culling are handled in order to improve performance
+- [**No Chat Reports**](https://modrinth.com/mod/no-chat-reports) - Makes chat unreportable (where possible)
+- [**OptiGUI**](https://modrinth.com/mod/optigui) - Blazing fast custom GUI textures on Fabric and Quilt with built-in OptiFine custom GUI resource pack support
+- [**Paginated Advancements & Custom Frames**](https://modrinth.com/mod/paginatedadvancements) - Better advancements screen
+- [**Polytone**](https://modrinth.com/mod/polytone) - Customize Map Color, Block Colors, Colormaps and Block Sounds, Biome Colors, Dye Colors. Supports Optifine format. For Resource Packs
+- [**Presence Footsteps**](https://modrinth.com/mod/presence-footsteps) - ..An Overly complicated Sound Mod...
+- [**Puzzle**](https://modrinth.com/mod/puzzle) - Adds resourcepack features and a GUI to more conveniently configure OptiFine alternatives.
+- [**Reese's Sodium Options**](https://modrinth.com/mod/reeses-sodium-options) - Alternative Options Menu for Sodium
+- [**Rethinking Voxels**](https://modrinth.com/mod/rethinking-voxels) - [WIP] A gameplay shaderpack based on complementary reimagined that has coloured block light with sharp shadows
+- [**Shrimple**](https://modrinth.com/mod/shrimple) - A simple Minecraft Java shader that attempts to maintain the vanilla aesthetic while adding optional shadows, colored lighting, and ray-tracing.
+- [**Shulker Box Tooltip**](https://modrinth.com/mod/shulkerboxtooltip) - View the contents of shulker boxes from your inventory
+- [**Simple Voice Chat**](https://modrinth.com/mod/simple-voice-chat) - A working voice chat in Minecraft!
+- [**Sodium**](https://modrinth.com/mod/sodium) - A modern rendering engine for Minecraft which greatly improves performance
+- [**Sodium Extra**](https://modrinth.com/mod/sodium-extra) - A Sodium addon that adds features that shouldn't be in Sodium.
+- [**Solas Shader**](https://modrinth.com/mod/solas-shader) - A good performing fantasy stylised shaderpack with colored lighting and fancy volumetrics
+- [**Sound Physics Remastered**](https://modrinth.com/mod/sound-physics-remastered) - A Minecraft mod that provides realistic sound attenuation, reverberation, and absorption through blocks.
+- [**Sparkles: Stardust Labs Resourcepack**](https://modrinth.com/mod/sparkles) - An optional resourcepack for all of Stardust Labs' projects
+- [**Super Duper Vanilla**](https://modrinth.com/mod/super-duper-vanilla) - A shader pack created to convey the style of the cancelled Super Duper Graphics Pack and other popular Minecraft titles.
+- [**Super Duper Vanilla Reimagined**](https://modrinth.com/mod/super-duper-vanilla-reimagined) - A shader pack that is created to improve the graphics of your game, leaving it in vanilla style
+- [**Translations for Sodium**](https://modrinth.com/mod/translations-for-sodium) - Unofficial translations for the Sodium Minecraft mod
+- [**YetAnotherConfigLib**](https://modrinth.com/mod/yacl) - A builder-based configuration library for Minecraft.
+- [**Your Options Shall Be Respected (YOSBR)**](https://modrinth.com/mod/yosbr) - Your options shall be respected.
+- [**Zoomify**](https://modrinth.com/mod/zoomify) - A zoom mod with infinite customizability.
+- [**EMF Entity Model Features**](https://modrinth.com/mod/entity-model-features) - EMF is an, OptiFine format, Custom Entity Model replacement mod available for Fabric and Forge.
+- [**ETF Entity Texture Features**](https://modrinth.com/mod/entitytexturefeatures) - Emissive, Random & Custom texture support for entities in resourcepacks just like Optifine but for Fabric

TrotCraft/client/mods/controlify.pw.toml

@@ -1,13 +1,13 @@
 name = "Controlify"
-filename = "Controlify-2.0.0-beta.3+1.20.4.jar"
+filename = "Controlify-2.0.0-beta.5+1.20.4.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/DOUdJVEm/versions/im0SBR8Y/Controlify-2.0.0-beta.3%2B1.20.4.jar"
+url = "https://cdn.modrinth.com/data/DOUdJVEm/versions/FeADDFg7/Controlify-2.0.0-beta.5%2B1.20.4.jar"
 hash-format = "sha1"
-hash = "455aa31c1869d07846a9171b25a86a16cab7f500"
+hash = "33783ebb7951e830f5d07e520f78ebe1d4ef7051"
 
 [update]
 [update.modrinth]
 mod-id = "DOUdJVEm"
-version = "im0SBR8Y"
+version = "FeADDFg7"

TrotCraft/client/mods/modmenu.pw.toml

@@ -1,13 +1,13 @@
 name = "Mod Menu"
-filename = "modmenu-9.1.0-beta.1.jar"
+filename = "modmenu-9.2.0-beta.2.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/w3icASIi/modmenu-9.1.0-beta.1.jar"
+url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/ybV7vGT5/modmenu-9.2.0-beta.2.jar"
 hash-format = "sha1"
-hash = "0417da163e6e9692c08c113117a1bd39337a7a03"
+hash = "ae50f27e17e1c6b9da1293c391729f4bd5e63f65"
 
 [update]
 [update.modrinth]
 mod-id = "mOgUt4GM"
-version = "w3icASIi"
+version = "ybV7vGT5"

TrotCraft/client/mods/yacl.pw.toml

@@ -1,13 +1,13 @@
 name = "YetAnotherConfigLib"
-filename = "yet-another-config-lib-fabric-3.3.2+1.20.4.jar"
+filename = "YetAnotherConfigLib-3.4.0+1.20.4-fabric.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/StXMrAsz/yet-another-config-lib-fabric-3.3.2%2B1.20.4.jar"
+url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/G8Aq3OEv/YetAnotherConfigLib-3.4.0%2B1.20.4-fabric.jar"
 hash-format = "sha1"
-hash = "9cbb8f3401160ec4422630bbf930208a898fe320"
+hash = "e0b74579c217b6161bac62ea2872af96660c589e"
 
 [update]
 [update.modrinth]
 mod-id = "1eAoo2KR"
-version = "StXMrAsz"
+version = "G8Aq3OEv"