Merge dev stuff#423
Merged
Merged
Conversation
This reverts commit 0e9981c.
looks slightly nicer that way
Only was being used by strainer, and strainer now tells you how to use it via tooltip
Restored melting functionality for all tools.
Updated changelog with detailed Tinkers Construct changes and fixed formatting issues.
commit 78232d2 Author: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Sat Apr 18 00:46:16 2026 -0500 Thats meant to be unreleased lol commit 8bb296d Author: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Sat Apr 18 00:44:02 2026 -0500 Update CHANGELOG for version 2.1.4 Added details for version 2.1.4, including new mod and updates. commit 4a0c967 Author: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Thu Apr 16 19:49:40 2026 -0500 Update pakku-lock.json commit 233ebe3 Author: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Thu Apr 16 19:49:15 2026 -0500 Update stage_4.snbt commit 8a258c7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon Mar 9 12:06:21 2026 -0500 Release: 2.1.3 (#402) commit bdd8bdc Author: Weblate (bot) <hosted@weblate.org> Date: Mon Jan 26 19:36:27 2026 +0100 Translations update from Hosted Weblate (#363) * Translated using Weblate (Ukrainian) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Ukrainian) Translated using Weblate (Ukrainian) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Ukrainian) Translated using Weblate (Ukrainian) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Ukrainian) Translated using Weblate (Ukrainian) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Ukrainian) Translated using Weblate (Ukrainian) Currently translated at 0.0% (0 of 261 strings) Translated using Weblate (Ukrainian) Currently translated at 25.0% (1 of 4 strings) Translated using Weblate (Ukrainian) Currently translated at 0.0% (0 of 4 strings) Added translation using Weblate (Ukrainian) Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Added translation using Weblate (Ukrainian) Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Merge remote-tracking branch 'origin/1.20.1' into 1.20.1 Translated using Weblate (French) Currently translated at 75.0% (3 of 4 strings) Translated using Weblate (Russian) Currently translated at 100.0% (4 of 4 strings) Translated using Weblate (Russian) Currently translated at 100.0% (1120 of 1120 strings) Translated using Weblate (Toki Pona) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Toki Pona) Translated using Weblate (Toki Pona) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Toki Pona) Translated using Weblate (Toki Pona) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Toki Pona) Translated using Weblate (Toki Pona) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Toki Pona) Translated using Weblate (Toki Pona) Currently translated at 0.0% (0 of 261 strings) Translated using Weblate (Toki Pona) Currently translated at 0.0% (0 of 4 strings) Added translation using Weblate (Toki Pona) Added translation using Weblate (Toki Pona) Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (261 of 261 strings) Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (1120 of 1120 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (4 of 4 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (4 of 4 strings) Translated using Weblate (Turkish) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Turkish) Translated using Weblate (Turkish) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Turkish) Translated using Weblate (Turkish) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Turkish) Translated using Weblate (Turkish) Currently translated at 100.0% (0 of 0 strings) Added translation using Weblate (Turkish) Translated using Weblate (Turkish) Currently translated at 0.0% (0 of 261 strings) Translated using Weblate (Turkish) Currently translated at 100.0% (4 of 4 strings) Translated using Weblate (Turkish) Currently translated at 0.0% (0 of 4 strings) Added translation using Weblate (Turkish) Added translation using Weblate (Turkish) Translated using Weblate (English (United States)) Currently translated at 25.0% (1 of 4 strings) Translated using Weblate (Russian) Currently translated at 99.9% (1119 of 1120 strings) Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Update translation files Updated by "Cleanup translation files" add-on in Weblate. Translated using Weblate (Russian) Currently translated at 99.9% (1119 of 1120 strings) Co-authored-by: Gabriel Carneiro <gecgpro12@gmail.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: JIA <430731352@qq.com> Co-authored-by: Jonas Tourvieille <jonas.t@laposte.net> Co-authored-by: Juri S. <2056.yuri.sklyarenko.mail.ru@gmail.com> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: Lin <Kennt43359@gmail.com> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Prosta4okua <danyavdele@gmail.com> Co-authored-by: Skrybl <owenwytrykowski@gmail.com> Co-authored-by: Yasli Oyuncu <yaslioyuncu@gmail.com> Co-authored-by: coden stark <codenstark@gmail.com> Translate-URL: https://hosted.weblate.org/projects/cabin/kubejs/tok/ Translate-URL: https://hosted.weblate.org/projects/cabin/kubejs/tr/ Translate-URL: https://hosted.weblate.org/projects/cabin/kubejs/uk/ Translate-URL: https://hosted.weblate.org/projects/cabin/kubejs/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/create/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/create/tok/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/create/tr/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/create/uk/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/en_US/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/es/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/fr/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/ru/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/tok/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/tr/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/functional-storage/uk/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/sophisticated-storage/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/sophisticated-storage/tok/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/sophisticated-storage/tr/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/sophisticated-storage/uk/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/thermal/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/thermal/tok/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/thermal/tr/ Translate-URL: https://hosted.weblate.org/projects/cabin/mods/thermal/uk/ Translate-URL: https://hosted.weblate.org/projects/cabin/questbook/ru/ Translate-URL: https://hosted.weblate.org/projects/cabin/questbook/tok/ Translate-URL: https://hosted.weblate.org/projects/cabin/questbook/tr/ Translate-URL: https://hosted.weblate.org/projects/cabin/questbook/uk/ Translate-URL: https://hosted.weblate.org/projects/cabin/questbook/zh_Hans/ Translation: CABIN/Create Translation: CABIN/Functional Storage Translation: CABIN/KubeJS Translation: CABIN/Questbook Translation: CABIN/Sophisticated Storage Translation: CABIN/Thermal * Deleted translation using Weblate (English (United States)) * unstarted lang files --------- Co-authored-by: Gabriel Carneiro <gecgpro12@gmail.com> Co-authored-by: JIA <430731352@qq.com> Co-authored-by: Jonas Tourvieille <jonas.t@laposte.net> Co-authored-by: Juri S. <2056.yuri.sklyarenko.mail.ru@gmail.com> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: Lin <Kennt43359@gmail.com> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Prosta4okua <danyavdele@gmail.com> Co-authored-by: Skrybl <owenwytrykowski@gmail.com> Co-authored-by: Yasli Oyuncu <yaslioyuncu@gmail.com> Co-authored-by: coden stark <codenstark@gmail.com> Co-authored-by: Pansmith <70342772+ThePansmith@users.noreply.github.com> commit 89d7006 Author: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Thu Jan 15 12:10:45 2026 -0600 Delete .github/ISSUE_TEMPLATE/feature_request.md commit 8770fdf Author: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Thu Jan 15 12:10:35 2026 -0600 Delete .github/ISSUE_TEMPLATE/bug_report.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.