diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index bbfb9e40..9caa4f21 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,4 @@ # These are supported funding model platforms patreon: TeamMoegProjects -custom: ['https://afdian.net/@teammoeg'] +custom: ['https://afdian.com/a/teammoeg'] diff --git a/.gitignore b/.gitignore index 0060bcbf..55487948 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ /versions/ # Launch cache -/servers.dat +# /servers.dat /NBTEdit.log /OpenComputersMod-1.7.5.1290-lua53-native.64.dylib /NBTEdit.log.lck diff --git a/README.md b/README.md index 6a714cd4..5d8ac47d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Tags Discord Patreon - Patreon
+ Patreon
- This is a Minecraft 1.7.10 Modpack created by TeamMoeg, centered around [TerraFirmaCraft](https://www.curseforge.com/minecraft/mc-mods/tfcraft), [GregTech-6-Unofficial](https://www.curseforge.com/minecraft/mc-mods/gregtech6-unofficial), and [Advanced Rocketry](https://www.curseforge.com/minecraft/mc-mods/advanced-rocketry). This Modpack is science-fiction and tech-oriented. @@ -34,7 +34,7 @@ ## Logo Like Our Modpack? -- TeamMoeg has developed and will maintain this Modpack for Free, but maintaining the servers cost money. Consider Sponsoring us at [Patreon](https://www.patreon.com/TeamMoeg) or [Aifadian (China)](https://afdian.net/@teammoeg) +- TeamMoeg has developed and will maintain this Modpack for Free, but maintaining the servers cost money. Consider Sponsoring us at [Patreon](https://www.patreon.com/TeamMoeg) or [Aifadian (China)](https://afdian.com/a/teammoeg) ## Logo Support Localization @@ -70,7 +70,7 @@ Tags Discord Patreon - Patreon
+ Patreon
- **一个由 TeamMoeg 制作的 Minecraft 1.7.10 整合包，围绕 [群峦传说](https://www.curseforge.com/minecraft/mc-mods/tfcraft), [格雷科技6非官方版](https://www.curseforge.com/minecraft/mc-mods/gregtech6-unofficial), 和 [高级火箭](https://www.curseforge.com/minecraft/mc-mods/advanced-rocketry) 制作。** @@ -92,7 +92,7 @@ ## 支持我们 -- 我们完全免费提供群峦：救援整合包，但是维护服务器和下载站需要资金，请考虑在 [Patreon](https://www.patreon.com/TeamMoeg) 或者 [爱发电](https://afdian.net/@teammoeg) 赞助我们！ +- 我们完全免费提供群峦：救援整合包，但是维护服务器和下载站需要资金，请考虑在 [Patreon](https://www.patreon.com/TeamMoeg) 或者 [爱发电](https://afdian.com/a/teammoeg) 赞助我们！ ## 加入开发，贡献一份力 diff --git a/config/CustomMainMenu/cn/mainmenu.json b/config/CustomMainMenu/cn/mainmenu.json index 79aa3a25..f1792059 100644 --- a/config/CustomMainMenu/cn/mainmenu.json +++ b/config/CustomMainMenu/cn/mainmenu.json @@ -262,7 +262,7 @@ "alignment": "bottomleft", "action": { "type": "openLink", - "link": "https://afdian.net/@teammoeg" + "link": "https://afdian.com/a/teammoeg" } }, "Forum": { diff --git a/config/CustomMainMenu/en/mainmenu.json b/config/CustomMainMenu/en/mainmenu.json index 47406ac3..eb7cbd5a 100644 --- a/config/CustomMainMenu/en/mainmenu.json +++ b/config/CustomMainMenu/en/mainmenu.json @@ -262,7 +262,7 @@ "alignment": "bottomleft", "action": { "type": "openLink", - "link": "https://afdian.net/@teammoeg" + "link": "https://afdian.com/a/teammoeg" } }, "Forum": { diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index 79aa3a25..f1792059 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -262,7 +262,7 @@ "alignment": "bottomleft", "action": { "type": "openLink", - "link": "https://afdian.net/@teammoeg" + "link": "https://afdian.com/a/teammoeg" } }, "Forum": { diff --git a/config/IC2.ini b/config/IC2.ini index 93bc4f23..0d327965 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config -; created Apr 5, 2020 1:32:45 PM +; created Dec 6, 2024 12:38:06 AM ;--- [worldgen] diff --git a/config/MatterOverdrive/Matter Overdrive.cfg b/config/MatterOverdrive/Matter Overdrive.cfg index b5c09fab..111c8e73 100644 --- a/config/MatterOverdrive/Matter Overdrive.cfg +++ b/config/MatterOverdrive/Matter Overdrive.cfg @@ -257,10 +257,10 @@ entities { # The speed in ticks, of decomposing. (per matter) I:speed.decompose=80 - # How much energy can the 物质分解仓 hold + # How much energy can the Matter Decomposer hold I:storage.energy=512000 - # How much matter can the 物质分解仓 hold + # How much matter can the Matter Decomposer hold I:storage.matter=1024 # The volume of the Machine @@ -285,10 +285,10 @@ entities { # The Energy Output per tick. Dependant on the size of the anomaly as well I:output.energy=2048 - # How much energy can the 聚变反应堆控制器 hold + # How much energy can the Fusion Reactor Controller hold I:storage.energy=100000000 - # How much matter can the 聚变反应堆控制器 hold + # How much matter can the Fusion Reactor Controller hold I:storage.matter=2048 # The volume of the Machine @@ -299,10 +299,10 @@ entities { # Should vent particles be displayed B:particles.vent=true - # How much energy can the 模式存储仓 hold + # How much energy can the Pattern Storage hold I:storage.energy=64000 - # The Transfer speed of the 模式存储仓 + # The Transfer speed of the Pattern Storage I:transfer.energy=128 # The volume of the Machine diff --git a/config/MoegAddon/moegadd.cfg b/config/MoegAddon/moegadd.cfg index 73b9a898..de6721eb 100644 --- a/config/MoegAddon/moegadd.cfg +++ b/config/MoegAddon/moegadd.cfg @@ -10,34 +10,19 @@ modules { # Set to true to show login message with modpack version [default: true] B:LoginMessage=true - # Version of the Modpack [default: 3.6.0.0] + # Version of the Modpack [default: 3.4.4.0] S:ModPackVersion=3.6.0.1 } url { - # [default: https://info.teammoeg.com/supportlist.txt] S:"Golden Support List URL"=https://info.teammoeg.com/supportlist.txt - - # [default: https://info.teammoeg.com/mec1.txt] S:"MEC1 Support List URL"=https://info.teammoeg.com/mec1.txt - - # [default: https://info.teammoeg.com/mec2.txt] S:"MEC2 Support List URL"=https://info.teammoeg.com/mec2.txt - - # [default: https://info.teammoeg.com/mec3.txt] S:"MEC3 Support List URL"=https://info.teammoeg.com/mec3.txt - - # [default: https://info.teammoeg.com/mec4.txt] S:"MEC4 Support List URL"=https://info.teammoeg.com/mec4.txt - - # [default: https://info.teammoeg.com/mec5.txt] S:"MEC5 Support List URL"=https://info.teammoeg.com/mec5.txt - - # [default: https://info.teammoeg.com/version.txt] S:"Modpack Version URL"=https://info.teammoeg.com/version.txt - - # [default: https://info.teammoeg.com/supportlistgold.txt] S:"Support List URL"=https://info.teammoeg.com/supportlistgold.txt } diff --git a/config/UnicodeFontFixer.cfg b/config/UnicodeFontFixer.cfg index ff2a3e7c..29035d8d 100644 --- a/config/UnicodeFontFixer.cfg +++ b/config/UnicodeFontFixer.cfg @@ -1,17 +1,17 @@ # Configuration file general { - # 黑名单中的Mod将不会被执行字体修复. + # Mods in the blacklist will be ignored. S:blacklist < Example Mod ExampleCraft|Factory > - # 设置字体修复的方法,可用参数如下: - # disabled: 不调整任何文字的大小. - # always: 无论是哪种字体,始终对文字作调整. - # moderate: 只有在中英文均为Unicode字体时,才对文字作调整. - # 建议将[fixDerpyFont]设置为moderate，并在游戏的语言选项中打开[强制使用Unicode字体] + # The method to fix derpy Text. Available parameters: + # disabled: Stop doing any font fixing. + # always: Apply font fixer regardless of the font type. + # moderate: Only work when all characters are displayed in Unicode font. + # I think the best practice is setting [fixDerpyFont] to moderate and turn on [Force Unicode Font] in game. S:fixDerpyFont=always } diff --git a/config/forestry/common.cfg b/config/forestry/common.cfg index 74cfeecb..6d6ae4b3 100644 --- a/config/forestry/common.cfg +++ b/config/forestry/common.cfg @@ -3,18 +3,18 @@ ~CONFIG_VERSION: 1.2.0 crafting { - # 开启青铜的合成表。 [default: true] + # Enables the crafting recipe for bronze. [default: true] B:bronze=false stamps { - # 禁止某种邮票的合成表。 [default: [20n, 50n, 100n]] [valid: [1n, 2n, 5n, 10n, 20n, 50n, 100n]] + # Disables the crafting recipe for certain stamps. [default: [20n, 50n, 100n]] [valid: [1n, 2n, 5n, 10n, 20n, 50n, 100n]] S:disabled < 20n 50n 100n > - # 允许合成邮票，如禁止，则将邮票视为货币来使用。 [default: true] + # Enables the crafting recipe for stamps. Disable to use stamps as a currency. [default: true] B:enabled=true } @@ -22,37 +22,37 @@ crafting { debug { - # 开启调试模式(仅适用于开发者)。 [default: false] + # Enable Debug mode (only useful to developers). [default: false] B:enabled=false } difficulty { - # 设置你偏好的游戏模式。若与服务器设置不匹配可能会导致出现合成表界面显示错误。 [default: EASY] [valid: [OP, EASY, NORMAL, HARD]] + # Set to your preferred game mode. Mismatch with the server may cause visual glitches with recipes. [default: EASY] [valid: [OP, EASY, NORMAL, HARD]] S:game.mode=EASY - # 使林业生成的地牢战利品更加稀有。 [default: false] + # Makes dungeon loot generated by forestry rarer. [default: false] B:loot.rare=false - # 强制重构config/forestry/gamemodes目录下的所有游戏模式配置。 [default: true] + # Forces recreation of the game mode definitions in config/forestry/gamemodes. [default: true] B:recreate.definitions=false } genetics { - # 清除含有无效基因的染色体。在移除林业拓展后这样操作也许可以恢复你因此崩溃的存档。 [default: false] + # Clears chromosomes which contain invalid alleles. Might rescue your save if it is crashing after the removal of a bee addon. [default: false] B:clear.invalid.chromosomes=false - # 允许蜜蜂、蝴蝶和玩家对原版树木授粉。禁用后，原版树须经过分析方可授粉。 [default: true] + # Allow bees, butterflies, and players to pollinate vanilla tree leaves. When disabled, vanilla trees must be analyzed before they can be pollinated. [default: true] B:pollinate.vanilla.trees=true research { boost { - # 在写字台中研究图片能够获得的最大百分比加成。 [range: 0.0 ~ 100.0, default: 5.0] + # The maximum percentage boost that can be applied by researching a mutation in the Escritoire. [range: 0.0 ~ 100.0, default: 5.0] S:max.percent=5.0 - # 在写字台中研究时突变几率的倍数。 [range: 1.0 ~ 1000.0, default: 1.5] + # Multiplies the chance of a mutation when it has been discovered in the Escritoire. [range: 1.0 ~ 1000.0, default: 1.5] S:multiplier=1.5 } @@ -62,23 +62,23 @@ genetics { performance { - # 开启背包自动填补。在繁忙的服务器中你可能不会希望开启该功能。 [default: true] + # Enable backpack resupply. You may want to set this to false on busy servers. [default: true] B:backpacks.resupply=true - # 开启粒子效果。注意调低原版设置也会影响到林业新增粒子效果。 [default: true] + # Enables particle effects. Note that Forestry respects Minecraft's reduced particle video settings. [default: true] B:particleFX=true } structures { - # 禁用多方块结构的列表。 [default: []] [valid: [alveary3x3, farm3x3, farm3x4, farm3x5, farm4x4, farm5x5]] + # List specific structures to disable them. [default: []] [valid: [alveary3x3, farm3x3, farm3x4, farm3x5, farm4x4, farm5x5]] S:disabled < > } tweaks { - # 开启林业机器的访问限制功能。 [default: true] + # Enables access restrictions on forestry machines. [default: true] B:permissions=true gui { @@ -86,42 +86,42 @@ tweaks { mail { alert { - # 开启新邮件提醒。 [default: true] + # Enables the new mail alert box. [default: true] B:enabled=true - # 邮箱提醒盒子在屏幕中的水平位置。 [default: LEFT] [valid: [LEFT, RIGHT]] + # Horizontal Position of the mail alert box on the screen. [default: LEFT] [valid: [LEFT, RIGHT]] S:xPosition=LEFT - # 邮箱提醒盒子在屏幕中的垂直位置。 [default: TOP] [valid: [TOP, BOTTOM]] + # Vertical Position of the mail alert box on the screen. [default: TOP] [valid: [TOP, BOTTOM]] S:yPosition=TOP } } tabs { - # 在耗能设备中显示当前的储能状态。 [default: true] + # Display the energy statistics tab on energy consumers. [default: true] B:energy=true - # 开启机器和引擎界面的提示窗口。 [default: true] + # Enables the hints tab on machine and engine guis. [default: true] B:hints=true - # 设置提示窗口展开与关闭的动画速度。 [range: 1 ~ 50, default: 8] + # Set the speed at which the gui side tabs open and close. [range: 1 ~ 50, default: 8] I:speed=8 } } farms { - # 使得农场支持更多实用设备中的末影百合种子。 [default: true] + # Enables farm support for ExtraUtilities Ender-lily seeds. [default: true] B:enderlily=true - # 使得农场支持魔法作物模组。 [default: true] + # Enables farm support for Magical Crops. [default: true] B:magicalcrops=true - # 设定耕地范围的放大倍数。 [range: 1 ~ 3, default: 2] + # Sets the size multiplier of the farmland. [range: 1 ~ 3, default: 2] I:size=2 - # 使农场使用正方形而非菱形的布局。 [default: false] + # Makes farms use a square layout instead of a diamond one. [default: false] B:square=false } @@ -131,33 +131,33 @@ tweaks { world { generate { - # 在他们的宅邸中生成林业添加的村民。 [default: true] + # Generates forestry villagers and their houses. [default: true] B:villagers=true retrogen { - # 强制在所有区块生成林业模组中的资源，即使这些地方已经生成过林业资源。 [default: false] + # Creates Forestry world generation in all chunks, even if they were generated there before. [default: false] B:forced=false - # 在模组未加入钱已载入的区块生成林业模组中的资源。 [default: false] + # Creates Forestry world generation in chunks that were created before the mod was added. [default: false] B:normal=false } beehives { - # 设置在世界中生成多少蜂巢。 [range: 0.0 ~ 10.0, default: 1.0] + # Sets how many beehives spawn in the world. [range: 0.0 ~ 10.0, default: 1.0] S:amount=1.0 - # 强制林业在所有可能位置生成蜂巢。(该选项会损坏存档，仅供开发者使用) [default: false] + # Force Forestry to generate a beehive at every possible location. (This will break your world. Only useful to developers) [default: false] B:debug=false } ore { - # 生成矿物的海拔高度。 [default: true] + # Generates apatite ore blocks in the world. [default: true] B:apatite=false - # 在世界中生成铜矿。 [default: true] + # Generates copper ore blocks in the world. [default: true] B:copper=false - # 在世界中生成锡矿。 [default: true] + # Generates tin ore blocks in the world. [default: true] B:tin=false } diff --git a/docs/MCBBS_POST_PURE_TEXT.txt b/docs/MCBBS_POST_PURE_TEXT.txt index d6465091..0ff6de50 100644 --- a/docs/MCBBS_POST_PURE_TEXT.txt +++ b/docs/MCBBS_POST_PURE_TEXT.txt @@ -225,7 +225,7 @@ [/align][/align][/align][align=left][align=center][align=left][font=Verdana][size=3][url=https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack]GitHub源码[/url] [/size][/font][/align][/align][align=center][align=left][font=Verdana][size=3][url=https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE_zh_CN]协议[/url] [/size][/font][/align][/align][align=center][align=left][url=https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/changelog_zh_CN.txt][font=Verdana][size=3]更新日志[/size][/font][/url][/align][/align][align=center][align=left][font=Verdana][size=3][url=https://music.163.com/playlist?id=4999861448&userid=492406948]BGM歌单[/url] -[/size][/font][/align][/align][align=center][align=left][align=left][align=center][align=left][font=Verdana][size=3][url=https://www.mcbbs.net/thread-1048934-1-1.html]官方服务器端[/url] （仅限公益服/好友联机使用）[/size][/font][/align][/align][/align][/align][/align][/align][align=center][align=left][url=https://discord.gg/97Mj6vK][font=Verdana][size=3]官方Discord群聊[/size][/font][/url][/align][/align][/align][align=left][align=center][align=left][font=Verdana][size=3][url=https://www.mcbbs.net/thread-1048934-1-1.html]官方QQ交流群[/url] 1046723658[/size][/font][/align][/align][align=center][align=left][font=Verdana][size=3][url=https://afdian.net/@teammoeg]爱发电赞助[/url] +[/size][/font][/align][/align][align=center][align=left][align=left][align=center][align=left][font=Verdana][size=3][url=https://www.mcbbs.net/thread-1048934-1-1.html]官方服务器端[/url] （仅限公益服/好友联机使用）[/size][/font][/align][/align][/align][/align][/align][/align][align=center][align=left][url=https://discord.gg/97Mj6vK][font=Verdana][size=3]官方Discord群聊[/size][/font][/url][/align][/align][/align][align=left][align=center][align=left][font=Verdana][size=3][url=https://www.mcbbs.net/thread-1048934-1-1.html]官方QQ交流群[/url] 1046723658[/size][/font][/align][/align][align=center][align=left][font=Verdana][size=3][url=https://afdian.com/a/teammoeg]爱发电赞助[/url] [/size][/font][/align][/align][align=center][align=left][url=https://www.patreon.com/TeamMoeg][font=Verdana][size=3]Patreon赞助[/size][/font][/url] [/align][/align][size=3][backcolor=rgb(255, 255, 255)][font=Tahoma, "][font=宋体][font=宋体][align=center][font=Tahoma, "][align=center][align=left][backcolor=rgb(245, 255, 250)][font=Tahoma, "][size=14px][/spoiler][/size][/font][/backcolor][/align][/align][/font][/align][/font][/font][/font][/backcolor][/size][/align][size=3][font=宋体][font=宋体][backcolor=rgb(255, 255, 255)][/backcolor][/font][/font][/size][/align][/align][/align][/td][/tr] [/table][/align] @@ -235,7 +235,7 @@ [/font][/size][align=center][font=Impact][size=3]我们重视每一个赞助者：[/size][/font][font=Impact][size=5]每一个[/size][/font][font=Impact][size=3]赞助我们的支持者都会被记录在 [url=http://www.terrafirmarescue.com:11004/index.php?title=%E9%BB%84%E9%87%91%E6%84%9F%E8%B0%A2%E5%90%8D%E5%8D%95]黄金感谢列表[/url] 和 [url=http://www.terrafirmarescue.com:11004/index.php?title=%E6%84%9F%E8%B0%A2%E5%90%8D%E5%8D%95]感谢列表[/url] 中，随整合包文件[/size][/font][font=Impact][size=5]一同发布[/size][/font][/align][align=center][font=Impact][size=4]为表达我们的感谢，我们为赞助者们和对整合包做出突出贡献的人给出以下回馈[/size][/font][/align][align=center][font=Impact][size=5] [/size][/font][/align][align=center][font=Impact][size=5]一. 赞助者游玩整合包时会拥有[color=#000080]群峦[/color][color=#4b0082]救援[/color][color=#ff8c00]L[/color][color=#000080]O[/color][color=#ff8c00]G[/color][color=#000080]O[/color]炫酷[color=#ff0000]星空背景披风[/color][/size][/font][/align][align=center][font=Verdana][size=3][url=https://sm.ms/image/NGqua9jmcIwVnWZ][img]https://i.loli.net/2020/09/18/NGqua9jmcIwVnWZ.jpg[/img][/url][/size][/font][/align][align=center][align=center][font=Impact][size=5]二. 您可以加入群峦救援内测交流群获取[color=#ff0000]最新版本的优先下载权[/color][/size][/font][/align][align=center][font=Impact][size=5]三. 您甚至将有机会用自己的的名字[color=#ff0000]命名[/color][/size][/font][color=#ff0000][font=Impact][size=5]游戏内的[/size][/font][font=Impact][size=5]一颗行星[/size][/font][/color][/align] [align=center][font=Impact][size=4][color=#ff0000]其他回馈方式和标准具体请前往爱发电查看！[/color][/size][/font][/align][/align][align=center][size=4][b]您的每一份赞助都是对我们最大的鼓励[/b][font=Impact] -[/font][/size][/align][align=center][font=Impact][size=3][b][u]⬇️ 点击下方给我们赞助 ⬇️[/u][/b][/size][/font][/align][align=center][align=left][align=left][align=center][font=Impact][size=4]国内用户：[url=https://afdian.net/@teammoeg]爱发电主页[/url][/size] +[/font][/size][/align][align=center][font=Impact][size=3][b][u]⬇️ 点击下方给我们赞助 ⬇️[/u][/b][/size][/font][/align][align=center][align=left][align=left][align=center][font=Impact][size=4]国内用户：[url=https://afdian.com/a/teammoeg]爱发电主页[/url][/size] [/font][/align][align=center][font=Impact][size=4]海外用户：[/size][url=https://www.patreon.com/TeamMoeg][size=4]Patreon赞助[/size][/url][/font][/align][/align][/align][align=left][size=3][backcolor=rgb(255, 255, 255)] [align=center][font=Impact][b]声明：您的赞助仅包含整合包内的原创内容，包括但不限于魔改，配置文件调整，原创模组[/b][/font][/align][align=center][b]您的赞助[color=#ff0000][size=4]不包含整合包内的任何非原创模组[/size][/color][/b][/align][align=center][font=Impact] [/font][/align][/backcolor][/size][/align][/align][/align][/align][/td][/tr] diff --git a/servers.dat b/servers.dat new file mode 100644 index 00000000..0a39de2a Binary files /dev/null and b/servers.dat differ