Merge branch 'main' into tfc-rework

2023-12-11 11:34:41 +07:00
parent 9927b73e30 70cee02444
commit d045f157ad
96 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ config/smoothboot.json
 .curseclient
 knownkeys.txt
 *.code-workspace
+mods/
--- a/mods/AI-Improvements-1.20-0.5.2.jar
+++ b/mods/AI-Improvements-1.20-0.5.2.jar
--- a/mods/AmbientSounds_FORGE_v5.3.5_mc1.20.1.jar
+++ b/mods/AmbientSounds_FORGE_v5.3.5_mc1.20.1.jar
--- a/mods/BetterCompatibilityChecker-forge-4.0.8+mc1.20.1.jar
+++ b/mods/BetterCompatibilityChecker-forge-4.0.8+mc1.20.1.jar
--- a/mods/BetterF3-7.0.2-Forge-1.20.1.jar
+++ b/mods/BetterF3-7.0.2-Forge-1.20.1.jar
--- a/mods/BetterPingDisplay-1.20.1-1.1.jar
+++ b/mods/BetterPingDisplay-1.20.1-1.1.jar
--- a/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar
+++ b/mods/BetterThirdPerson-Forge-1.20-1.9.0.jar
--- a/mods/ChatImage-1.1.12+1.20.1+forge.jar
+++ b/mods/ChatImage-1.1.12+1.20.1+forge.jar
--- a/mods/CraftPresence-2.2.5+1.20.1.jar
+++ b/mods/CraftPresence-2.2.5+1.20.1.jar
--- a/mods/CreativeCore_FORGE_v2.11.11_mc1.20.1.jar
+++ b/mods/CreativeCore_FORGE_v2.11.11_mc1.20.1.jar
--- a/mods/Cucumber-1.20.1-7.0.6.jar
+++ b/mods/Cucumber-1.20.1-7.0.6.jar
--- a/mods/EverlastingSkins-1.20.1-1.0.jar
+++ b/mods/EverlastingSkins-1.20.1-1.0.jar
--- a/mods/FTBQuestsOptimizer-forge-1.1.4-1.20.1.jar
+++ b/mods/FTBQuestsOptimizer-forge-1.1.4-1.20.1.jar
--- a/mods/FastFurnace-1.20.1-8.0.1.jar
+++ b/mods/FastFurnace-1.20.1-8.0.1.jar
--- a/mods/FastSuite-1.20.1-5.0.1.jar
+++ b/mods/FastSuite-1.20.1-5.0.1.jar
--- a/mods/FastWorkbench-1.20.1-8.0.2.jar
+++ b/mods/FastWorkbench-1.20.1-8.0.2.jar
--- a/mods/Firmalife-1.20.1-2.0.4-beta.jar
+++ b/mods/Firmalife-1.20.1-2.0.4-beta.jar
--- a/mods/ItemPhysicLite_FORGE_v1.6.1_mc1.20.jar
+++ b/mods/ItemPhysicLite_FORGE_v1.6.1_mc1.20.jar
--- a/mods/Jade-1.20.1-forge-11.6.3.jar
+++ b/mods/Jade-1.20.1-forge-11.6.3.jar
--- a/mods/JadeAddons-1.20.1-forge-5.2.2.jar
+++ b/mods/JadeAddons-1.20.1-forge-5.2.2.jar
--- a/mods/MouseTweaks-forge-mc1.20-2.25.jar
+++ b/mods/MouseTweaks-forge-mc1.20-2.25.jar
--- a/mods/NoChatReports-FORGE-1.20.1-v2.2.2.jar
+++ b/mods/NoChatReports-FORGE-1.20.1-v2.2.2.jar
--- a/mods/Patchouli-1.20.1-83-FORGE.jar
+++ b/mods/Patchouli-1.20.1-83-FORGE.jar
--- a/mods/PickUpNotifier-v8.0.0-1.20.1-Forge.jar
+++ b/mods/PickUpNotifier-v8.0.0-1.20.1-Forge.jar
--- a/mods/Placebo-1.20.1-8.6.0.jar
+++ b/mods/Placebo-1.20.1-8.6.0.jar
--- a/mods/PuzzlesLib-v8.1.11-1.20.1-Forge.jar
+++ b/mods/PuzzlesLib-v8.1.11-1.20.1-Forge.jar
--- a/mods/REIPluginCompatibilities-forge-12.0.93.jar
+++ b/mods/REIPluginCompatibilities-forge-12.0.93.jar
--- a/mods/RoughlyEnoughItems-12.0.674.jar
+++ b/mods/RoughlyEnoughItems-12.0.674.jar
--- a/mods/SimpleLogin-1.20.1-1.0.2-all.jar
+++ b/mods/SimpleLogin-1.20.1-1.0.2-all.jar
--- a/mods/Steam_Rails-1.5.3+forge-mc1.20.1.jar
+++ b/mods/Steam_Rails-1.5.3+forge-mc1.20.1.jar
--- a/mods/TFCAgedAlcohol-1.20.1-2.0.jar
+++ b/mods/TFCAgedAlcohol-1.20.1-2.0.jar
--- a/mods/TFCAstikorCarts-1.20.1-1.1.7.2.jar
+++ b/mods/TFCAstikorCarts-1.20.1-1.1.7.2.jar
--- a/mods/TerraFirmaCraft-Forge-1.20.1-3.1.3-beta.jar
+++ b/mods/TerraFirmaCraft-Forge-1.20.1-3.1.3-beta.jar
--- a/mods/ToolBelt-1.20-1.20.0.jar
+++ b/mods/ToolBelt-1.20-1.20.0.jar
--- a/mods/XaerosWorldMap_1.37.2_Forge_1.20.jar
+++ b/mods/XaerosWorldMap_1.37.2_Forge_1.20.jar
--- a/mods/Xaeros_Minimap_23.9.3_Forge_1.20.jar
+++ b/mods/Xaeros_Minimap_23.9.3_Forge_1.20.jar
--- a/mods/ad_astra-forge-1.20.1-1.15.5.jar
+++ b/mods/ad_astra-forge-1.20.1-1.15.5.jar
--- a/mods/ae2wtlib-15.2.1-forge.jar
+++ b/mods/ae2wtlib-15.2.1-forge.jar
--- a/mods/appliedenergistics2-forge-15.0.15.jar
+++ b/mods/appliedenergistics2-forge-15.0.15.jar
--- a/mods/architectury-9.1.12-forge.jar
+++ b/mods/architectury-9.1.12-forge.jar
--- a/mods/astikorcarts-1.20.x-1.1.6.jar
+++ b/mods/astikorcarts-1.20.x-1.1.6.jar
--- a/mods/balm-forge-1.20.1-7.2.1.jar
+++ b/mods/balm-forge-1.20.1-7.2.1.jar
--- a/mods/blur-forge-3.1.1.jar
+++ b/mods/blur-forge-3.1.1.jar
--- a/mods/botarium-forge-1.20.1-2.2.1.jar
+++ b/mods/botarium-forge-1.20.1-2.2.1.jar
--- a/mods/canary-mc1.20.1-0.2.7.jar
+++ b/mods/canary-mc1.20.1-0.2.7.jar
--- a/mods/cc-tweaked-1.20.1-forge-1.109.0.jar
+++ b/mods/cc-tweaked-1.20.1-forge-1.109.0.jar
--- a/mods/cherishedworlds-forge-6.1.4+1.20.1.jar
+++ b/mods/cherishedworlds-forge-6.1.4+1.20.1.jar
--- a/mods/clienttweaks-forge-1.20-11.1.0.jar
+++ b/mods/clienttweaks-forge-1.20-11.1.0.jar
--- a/mods/cloth-config-11.1.106-forge.jar
+++ b/mods/cloth-config-11.1.106-forge.jar
--- a/mods/corpse-1.20.1-1.0.9.jar
+++ b/mods/corpse-1.20.1-1.0.9.jar
--- a/mods/cosmeticarmorreworked-1.20.1-v1a.jar
+++ b/mods/cosmeticarmorreworked-1.20.1-v1a.jar
--- a/mods/create-1.20.1-0.5.1.f.jar
+++ b/mods/create-1.20.1-0.5.1.f.jar
--- a/mods/cupboard-1.20.1-2.1.jar
+++ b/mods/cupboard-1.20.1-2.1.jar
--- a/mods/curios-forge-5.4.5+1.20.1.jar
+++ b/mods/curios-forge-5.4.5+1.20.1.jar
--- a/mods/defaultoptions-forge-1.20-18.0.1.jar
+++ b/mods/defaultoptions-forge-1.20-18.0.1.jar
--- a/mods/drippyloadingscreen_forge_2.2.4_MC_1.20.1.jar
+++ b/mods/drippyloadingscreen_forge_2.2.4_MC_1.20.1.jar
--- a/mods/dynamiclightsreforged-1.20.1_v1.6.0.jar
+++ b/mods/dynamiclightsreforged-1.20.1_v1.6.0.jar
--- a/mods/embeddium-0.2.12+mc1.20.1.jar
+++ b/mods/embeddium-0.2.12+mc1.20.1.jar
--- a/mods/entityculling-forge-1.6.2-mc1.20.1.jar
+++ b/mods/entityculling-forge-1.6.2-mc1.20.1.jar
--- a/mods/exposure-1.20.1-1.1.1.jar
+++ b/mods/exposure-1.20.1-1.1.1.jar
--- a/mods/fancymenu_forge_2.14.9-3_MC_1.20.1.jar
+++ b/mods/fancymenu_forge_2.14.9-3_MC_1.20.1.jar
--- a/mods/farsight-1.20.1-3.6.jar
+++ b/mods/farsight-1.20.1-3.6.jar
--- a/mods/ferritecore-6.0.1-forge.jar
+++ b/mods/ferritecore-6.0.1-forge.jar
--- a/mods/ftb-essentials-forge-2001.2.2.jar
+++ b/mods/ftb-essentials-forge-2001.2.2.jar
--- a/mods/ftb-library-forge-2001.1.4.jar
+++ b/mods/ftb-library-forge-2001.1.4.jar
--- a/mods/ftb-quests-forge-2001.3.0.jar
+++ b/mods/ftb-quests-forge-2001.3.0.jar
--- a/mods/ftb-ranks-forge-2001.1.3.jar
+++ b/mods/ftb-ranks-forge-2001.1.3.jar
--- a/mods/ftb-teams-forge-2001.1.4.jar
+++ b/mods/ftb-teams-forge-2001.1.4.jar
--- a/mods/gtceu-forge-1.20.1-1.0.17.jar
+++ b/mods/gtceu-forge-1.20.1-1.0.17.jar
--- a/mods/inventorysorter-1.20.1-23.0.1.jar
+++ b/mods/inventorysorter-1.20.1-23.0.1.jar
--- a/mods/invhud.forge.1.20.1-3.4.18.jar
+++ b/mods/invhud.forge.1.20.1-3.4.18.jar
--- a/mods/item-filters-forge-2001.1.0-build.59.jar
+++ b/mods/item-filters-forge-2001.1.0-build.59.jar
--- a/mods/konkrete_forge_1.6.1-2_MC_1.20.jar
+++ b/mods/konkrete_forge_1.6.1-2_MC_1.20.jar
--- a/mods/kubejs-forge-2001.6.4-build.111.jar
+++ b/mods/kubejs-forge-2001.6.4-build.111.jar
--- a/mods/kubejs_tfc-1.20.1-1.0.3.jar
+++ b/mods/kubejs_tfc-1.20.1-1.0.3.jar
--- a/mods/lootjs-forge-1.20.1-2.10.4.jar
+++ b/mods/lootjs-forge-1.20.1-2.10.4.jar
--- a/mods/mcw_tfc_aio-0.1.3-1.20.1.jard
+++ b/mods/mcw_tfc_aio-0.1.3-1.20.1.jard
--- a/mods/modernfix-forge-5.10.0+mc1.20.1.jar
+++ b/mods/modernfix-forge-5.10.0+mc1.20.1.jar
--- a/mods/morered-1.20.1-4.0.0.4.jar
+++ b/mods/morered-1.20.1-4.0.0.4.jar
--- a/mods/notenoughanimations-forge-1.6.4-mc1.20.jar
+++ b/mods/notenoughanimations-forge-1.6.4-mc1.20.jar
--- a/mods/oculus-mc1.20.1-1.6.9.jar
+++ b/mods/oculus-mc1.20.1-1.6.9.jar
--- a/mods/open-parties-and-claims-forge-1.20.1-0.20.1.jar
+++ b/mods/open-parties-and-claims-forge-1.20.1-0.20.1.jar
--- a/mods/resourcefulconfig-forge-1.20.1-2.1.0.jar
+++ b/mods/resourcefulconfig-forge-1.20.1-2.1.0.jar
--- a/mods/resourcefullib-forge-1.20.1-2.1.19.jar
+++ b/mods/resourcefullib-forge-1.20.1-2.1.19.jar
--- a/mods/rhino-forge-2001.2.2-build.18.jar
+++ b/mods/rhino-forge-2001.2.2-build.18.jar
--- a/mods/rubidium-extra-0.5.3.1+mc1.20.1-build.110.jar
+++ b/mods/rubidium-extra-0.5.3.1+mc1.20.1-build.110.jar
--- a/mods/serverconfigupdater-4.0.2.jar
+++ b/mods/serverconfigupdater-4.0.2.jar
--- a/mods/smallships-forge-1.20.1-2.0.0-a2.3.3.jar
+++ b/mods/smallships-forge-1.20.1-2.0.0-a2.3.3.jar
--- a/mods/smoothboot-mc1.20.1-0.0.3.jar
+++ b/mods/smoothboot-mc1.20.1-0.0.3.jar
--- a/mods/sophisticatedbackpacks-1.20.1-3.19.1.962.jar
+++ b/mods/sophisticatedbackpacks-1.20.1-3.19.1.962.jar
--- a/mods/sophisticatedcore-1.20.1-0.5.108.504.jar
+++ b/mods/sophisticatedcore-1.20.1-0.5.108.504.jar
--- a/mods/terrafirmagreg-1.20.1-0.0.13.jar
+++ b/mods/terrafirmagreg-1.20.1-0.0.13.jar
--- a/mods/tfcambiental-1.20.1-3.2.0.jar
+++ b/mods/tfcambiental-1.20.1-3.2.0.jar
--- a/mods/tfships-1.20.1-1.0.jar
+++ b/mods/tfships-1.20.1-1.0.jar
--- a/mods/treetap-1.20.1-0.2.1.jar
+++ b/mods/treetap-1.20.1-0.2.1.jar
--- a/mods/waterflasks-3.0.2.jar
+++ b/mods/waterflasks-3.0.2.jar