Skip to content

Commit

Permalink
Update MoegAddon and update supportlist
Browse files Browse the repository at this point in the history
  • Loading branch information
yuesha-yc committed Feb 11, 2021
1 parent 937e7e6 commit 398f720
Show file tree
Hide file tree
Showing 13 changed files with 191 additions and 48 deletions.
66 changes: 33 additions & 33 deletions changelog_en_US.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Mod changes:
- Added FoamFix-1.7.10-beta2
- Upgraded gregtech_1.7.10-6.15.07-unofficial
- Upgraded Botania-TFR-2605
- Upgraded MoegAddon_1.7.10-1.14
- Upgraded MoegAddon_1.7.10-1.15

Content changes:
- Added multi-block aquatic farm
Expand Down Expand Up @@ -47,7 +47,7 @@ Mod variations:
- Upgrade DraconicEvolution-1710-TFR-v2

Content changes:
- Fix the problem that the GUI of the Dragon Research Mod does not have materials.
- Fixed the problem that the GUI of the Dragon Research Mod does not have materials.


3.5.1.0
Expand All @@ -72,19 +72,19 @@ Content Changes:
- Fixes potash water synthesis conflicts
- The primary platinum granule crusher has two different outputs
- Repair Expert mode can synthesize blue steel over Grey Anvil.
- Fix for not being able to make wool yarn on the loom
- Fixed for not being able to make wool yarn on the loom
- Repair of the soldering consumable programming circuit for the pot and hacksaw.
- Indicators for restoring lapis lazuli are platinum stones.
- Double-layer plastic ingot in MESU shell without synthetic formulation
- Fix recipe error in Tara Crusher due to inability to synthesize live wood rods.
- Fix English spelling problem in Blue Line UI
- Fix Qunlian Legend ingot stack duplication problem
- Fix Malachite can't be processed in Greystone Crusher
- Fix wrought iron drawing plate task unrecognized problem.
- Fixed recipe error in Tara Crusher due to inability to synthesize live wood rods.
- Fixed English spelling problem in Blue Line UI
- Fixed TFC ingot stack duplication problem
- Fixed Malachite can't be processed in Greystone Crusher
- Fixed wrought iron drawing plate task unrecognized problem.


3.5.0.0
Mod variations
Mod Changes:
- Upgrade TFC0.80.08-TFR
- Upgrade gregtech6.15.03-unofficial
- Upgrade Botania2603-TFR
Expand Down Expand Up @@ -151,7 +151,7 @@ Mod changes:
- Update BetterLoadingScreen-1.4.1-TFR

Content Changes :
- Fix for Unable to Load Resources
- Fixed for Unable to Load Resources


3.4.1.0
Expand All @@ -163,7 +163,7 @@ Mod changes:
- Add BetterLoadingScreen-1.4.00-TFR

Content Changes :
- Fix bugs that appeared in the previous version
- Fixed bugs that appeared in the previous version
- Add a better looking loading interface
- Adding tips to the loading screen
- Repair of oil purifier
Expand All @@ -179,7 +179,7 @@ Mod changes:
- Add Baubles

Content Changes :
- Fix various bugs in TFC switching worlds
- Fixed various bugs in TFC switching worlds
- Adds compatibility with Plant Magic and Lore of the Mountains
- The world is now generating magic flowers.
- The Crucible of Magic
Expand All @@ -199,12 +199,12 @@ Mod changes:
- Upgrade TFC0.80.03-TFR

Content Changes :
- Fix the item ID changes that appeared in the previous version
- Fixed the item ID changes that appeared in the previous version
- Fixing a series of crashes caused by the previous version of Mojo.
- Fix TFC stone anvil that would brush items
- Fixed TFC stone anvil that would brush items
- TFC sheets are now melted in a crucible to yield half the original metal units.
- Fix synthetic clay tiles sometimes glitching issue
- Fix issue with forge recipes disappearing/not aligning when switching dimensions (server multiworld plugin)
- Fixed synthetic clay tiles sometimes glitching issue
- Fixed issue with forge recipes disappearing/not aligning when switching dimensions (server multiworld plugin)


3.3.3.0
Expand All @@ -217,8 +217,8 @@ Mod changes:
Content changes
- Fixed a few bits and pieces of bugs
- Repair of paper fibers cannot be made in barrels
- Fix the issue of quitting the server when advanced rocket disintegration
- Fix auto-blower Mod without English localization
- Fixed the issue of quitting the server when advanced rocket disintegration
- Fixed auto-blower Mod without English localization
- Repair of ammonium chloride not localized
- Modification of Minko steam engine synthesis
- Glass is no longer available in the campfire.
Expand All @@ -231,9 +231,9 @@ Mod changes:
- Update gregtech6.14.03

Content Change:
- Fix PUV1 emitter not synthesizing
- Fix glass can't be manufactured at the hot electronic table
- Fix nailed leather composite conflicts
- Fixed PUV1 emitter not synthesizing
- Fixed glass can't be manufactured at the hot electronic table
- Fixed nailed leather composite conflicts
- Adding agreements to the document
- Modify OB reservoir elevator and other partial item synthesis
- Elevators and rotating elevators can now change colors with a chisel
Expand All @@ -244,7 +244,7 @@ Content Change:
- Increased lotus leaf synthesis
- Increased cactus synthesis
- Change Dragon Egg Synthesis
- Fix fusion some recipes swallowing programmed circuits
- Fixed fusion some recipes swallowing programmed circuits
- Dry paper powders now don't need potash water.
- Circuit Board Backplane Manufacturing Price Reductions
- AE fluid storage for some items to change synthesis
Expand Down Expand Up @@ -273,11 +273,11 @@ Mod changes.
Content changes.
- Repair of some tasks that could not be submitted
- Fixing the GT Large Matter Manufacturing and Large Matter Replication Synthesis conflict
- Fix the space elevator can't be made.
- Fixed the space elevator can't be made.
- Restoration can only be done with slabs of granite.
- Fix tin-alloy plates that don't heat up
- Fix meaningless text messages to start the game
- Fix part of the fluid not displaying names properly
- Fixed tin-alloy plates that don't heat up
- Fixed meaningless text messages to start the game
- Fixed part of the fluid not displaying names properly
- Alter Substance Replication Trio Large Machine Master Cube Synthesis
- Change distillation tower and cracking tower main cube synthesis
- Change some missions to accept more items
Expand All @@ -300,8 +300,8 @@ Mod changes.
- None

Content changes.
- Fix serious formulation problems
- Fix serious Mod problems
- Fixed serious formulation problems
- Fixed serious Mod problems


3.3.1.0:
Expand Down Expand Up @@ -345,8 +345,8 @@ CurseForge version of the following Mod versions are lower:
Content changes.
- Complete modification of the original platinum-based metal mineral processing method
- Fixed the conflict between the diamond chest and crystal chest synthesis
- Fix AR projector compositions
- Fix Anvil Synthesis
- Fixed AR projector compositions
- Fixed Anvil Synthesis
- Restoration of the cistern can only be made of oak.
- Changing the endless set synthesis
- Change Jetpack, Power Jetpack Synthesis
Expand Down Expand Up @@ -410,8 +410,8 @@ Mod changes.
- Add WirelessCraftingTerminal

Content changes.
- Fix the mission statement bug
- Fix a bug that caused wrought iron products to be placed in the common iron mineral dictionary.
- Fixed the mission statement bug
- Fixed a bug that caused wrought iron products to be placed in the common iron mineral dictionary.
- New high-temperature mixers have been added to replace the existing flash processors in photoresist manufacturing and mixers in epoxy manufacturing.
- New recipes for the treatment of moon top soil and iron oxide sand have been added.
- New partial fusion formulation
Expand Down Expand Up @@ -444,5 +444,5 @@ Content changes.
- New synthesis of molten shadow pearls
- Adding the manufacture of Gray's leather
- Fixed an issue where the Qunran and Gray tools were not working together.
- Fix the nanomanufacturing jam technology
- Fixed the nanomanufacturing jam technology
- Repair of polysilicon crushing
12 changes: 7 additions & 5 deletions changelog_zh_CN.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
3.6.0.0
模组变化:
· 新增FoamFix-1.7.10-beta2
· 升级gregtech_1.7.10-6.15.06-unofficial
· 升级gregtech_1.7.10-6.15.07-unofficial
· 升级Botania-TFR-2605
· 升级MoegAddon_1.7.10-1.15

内容变化:
· 新增多方块水产养殖场
Expand All @@ -16,8 +17,12 @@
· 新增GT配方里的显示的数字现在有分隔符了
· 新增钾盐可以在碎石机处理了
· 新增化肥可以通过多种肥料转换
· 新增提醒更新任务书
· 新增铱-铂小行星
· 移除腐肉炼金催化为皮革配方
· 移除IC2洗矿机和打粉机合成
· 移除制作塔克袋的配方,因为他们会造成服务器崩溃
· 更改了褐铁矿的处理方式
· 铬铁现在可以通过坩埚冶炼成铬
· 更新了TFC的汉化
· 更新了TFC Udary Mod的汉化
· 更新了TFC Auto Bellow的英文
Expand All @@ -26,8 +31,6 @@
· 优化了燃烧室合成造价
· 修复沥青铀矿可以制作为粉碎铀矿石
· 修复钾碱水和灰色染料合成冲突
· 移除腐肉炼金催化为皮革配方
· 移除IC2洗矿机和打粉机合成
· 修复做玻璃消耗鼓风嘴
· 修复原版金粒不可以获得
· 修复基因工业的升级框架无法合成
Expand All @@ -38,7 +41,6 @@
· 修复奶酪营养值为水果
· 修复锅炉车无法合成
· 修复圆石转换冲突
· 修复制作塔克袋复制小刀

3.5.1.1
模组变化:
Expand Down
29 changes: 28 additions & 1 deletion config/MoegAddon/moegadd.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,35 @@ modules {
# Set to true to show login message with modpack version [default: true]
B:LoginMessage=true

# Version of the Modpack [default: 3.4.4.0]
# Version of the Modpack [default: 3.6.0.0]
S:ModPackVersion=3.6.0.0
}


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
}


34 changes: 25 additions & 9 deletions modpack/common/scripts/CommonGT.zs
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,31 @@ recipes.addShaped(<gregtech:gt.multiitem.randomtools:989>,

// Heating clay molds to ceramic

mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1005>, <gregtech:gt.multiitem.randomtools:989>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32706>, <gregtech:gt.multiitem.randomtools:995>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32722>, <gregtech:gt.multiitem.randomtools:994>, 500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1870>, <gregtech:gt.multiitem.randomtools:993>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1705>, <gregtech:gt.multiitem.randomtools:992>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>, <gregtech:gt.multiitem.randomtools:991>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1755>, <gregtech:gt.multiitem.randomtools:990>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32723>, <gregtech:gt.multiitem.randomtools:988>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32728>, <gregtech:gt.multiitem.randomtools:987>, 1500, 0.35);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1005>, <gregtech:gt.multiitem.randomtools:989>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32706>, <gregtech:gt.multiitem.randomtools:995>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32722>, <gregtech:gt.multiitem.randomtools:994>, 500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1870>, <gregtech:gt.multiitem.randomtools:993>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1705>, <gregtech:gt.multiitem.randomtools:992>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>, <gregtech:gt.multiitem.randomtools:991>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1755>, <gregtech:gt.multiitem.randomtools:990>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32723>, <gregtech:gt.multiitem.randomtools:988>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:32728>, <gregtech:gt.multiitem.randomtools:987>, 1500, 0.1);

// Heating Shape molds to ceramic

/* TFC Heating currently doesn't support NBT output itemstack.
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 15153614}), <gregtech:gt.multiitem.randomtools:900>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 25952256}), <gregtech:gt.multiitem.randomtools:901>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 33554431}), <gregtech:gt.multiitem.randomtools:902>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 473536}), <gregtech:gt.multiitem.randomtools:903>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 4224}), <gregtech:gt.multiitem.randomtools:904>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 31744}), <gregtech:gt.multiitem.randomtools:905>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 17043521}), <gregtech:gt.multiitem.randomtools:906>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 31388732}), <gregtech:gt.multiitem.randomtools:907>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 469440}), <gregtech:gt.multiitem.randomtools:908>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 22506965}), <gregtech:gt.multiitem.randomtools:909>, 1500, 0.1);
mods.Terrafirmacraft.ItemHeat.addRecipe(<gregtech:gt.multitileentity:1055>.withTag({"gt.mold": 11512810}), <gregtech:gt.multiitem.randomtools:910>, 1500, 0.1);
*/

// higher tier crucibles
recipes.addShaped(<gregtech:gt.multitileentity:1033>,
Expand Down
3 changes: 3 additions & 0 deletions resources/moegadd/texts/mec1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Test1
Test2
Test3
3 changes: 3 additions & 0 deletions resources/moegadd/texts/mec2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Test1
Test2
Test3
3 changes: 3 additions & 0 deletions resources/moegadd/texts/mec3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Test1
Test2
Test3
3 changes: 3 additions & 0 deletions resources/moegadd/texts/mec4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Test1
Test2
Test3
3 changes: 3 additions & 0 deletions resources/moegadd/texts/mec5.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Test1
Test2
Test3
43 changes: 43 additions & 0 deletions resources/moegadd/texts/supporterlist.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
6gQ
g5DS
luker
ucantry
wakasagisan
cadyb
boozzeeboom
LebN_N
031130
wuwu0019
Yexi_lin
s9hy_sky
Dream_Sakura
YanDIOda
abcAFCR
Liang_Jie
03110
sun_nuo
Yenmor
shi__yu
cool_breeze233
Xiao_Xuan_Sang
cheng_tu
Lestech233
Fried_ice
qianxunzy
spyno1
lao__ma
dexing
SHIRO
MoeCocoa
Illusory_River
qazokmwsxijn
ifuan
HongChenXiao
zsybh1
Sayamis
LittleAK
zhangjunning
1q1q
Ji_tong
Hongchafang
Luyen
8 changes: 8 additions & 0 deletions resources/moegadd/texts/supporterlistgold.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
leiyu
MingKeLing
Maplefung
Anonlement
6yyyyy
sanrenxin
BlueDance
magicall
Loading

0 comments on commit 398f720

Please sign in to comment.