Merge pull request #142 from Kiwi233/master

QF
Kiwi233 · Dec 31, 2021 · 32cf271 · 32cf271
2 parents 7ab7119 + 9c0be1e
commit 32cf271
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/resources/neicustomdiagram/lang/zh_CN.lang b/resources/neicustomdiagram/lang/zh_CN.lang
@@ -143,7 +143,7 @@ neicustomdiagram.generators.gregtech5.materialparts.springsslot=弹簧
 neicustomdiagram.generators.gregtech5.materialparts.gearsslot=齿轮
 neicustomdiagram.generators.gregtech5.materialparts.rotorslot=转子
 neicustomdiagram.generators.gregtech5.materialparts.casingslot=机械方块
-neicustomdiagram.generators.gregtech5.materialparts.barsslot=Bars
+neicustomdiagram.generators.gregtech5.materialparts.barsslot=条
 neicustomdiagram.generators.gregtech5.materialparts.frameboxslot=框架
 neicustomdiagram.generators.gregtech5.materialparts.wiresslot=导线
 neicustomdiagram.generators.gregtech5.materialparts.finewireslot=细导线

diff --git a/scripts/Ender-IO.zs b/scripts/Ender-IO.zs
@@ -456,7 +456,7 @@ recipes.remove(<EnderIO:itemLiquidConduit:1>);
 // --- Ender Fluid Conduit
 recipes.remove(<EnderIO:itemLiquidConduit:2>);
 
-+// --- Crystalline Ender Fluid Conduit
+// --- Crystalline Ender Fluid Conduit
 recipes.remove(<EnderIO:itemLiquidConduit:3>);
 
 // --- Crystalline Pink Slime Ender Fluid Conduit

diff --git a/scripts/Thaumcraft-01-Basic.zs b/scripts/Thaumcraft-01-Basic.zs
@@ -214,7 +214,6 @@ game.setLocalization("WARPTHEORY.research_page.WARPWARNING.1", "\u795e\u79d8\u90
 mods.thaumcraft.Research.addPage("WARPWARNING", "WARPTHEORY.research_page.WARPWARNING.2");
 game.setLocalization("WARPTHEORY.research_page.WARPWARNING.2", "\u795e\u79d8\u626d\u66f2\u5b66\u6dfb\u52a0\u4e86\u4e00\u7cfb\u5217\u626d\u66f2\u6548\u679c.\u4f60\u8981\u4e07\u5206\u5f53\u5fc3\u56e0\u4e3a\u4f60\u80af\u5b9a\u4e0d\u60f3\u5728\u4f60\u7684\u57fa\u5730\u5185\u90e8\u6216\u5468\u56f4\u751f\u6210\u51cb\u7075<BR>\u8bf7\u7ee7\u7eed\u9605\u8bfb\u4ee5\u4e0b\u7684\u626d\u66f2\u6548\u679c\u5217\u8868.");
 mods.thaumcraft.Research.addPage("WARPWARNING", "WARPTHEORY.research_page.WARPWARNING.3");
-game.setLocalization("WARPTHEORY.research_page.WARPWARNING.3", 
 game.setLocalization("WARPTHEORY.research_page.WARPWARNING.3", "\u0035\u626d\u66f2\u003a\u0020\u8baf\u606f\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0031\u0030\u626d\u66f2\u003a\u0020\u865a\u62df\u7206\u70b8\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0031\u0035\u626d\u66f2\u003a\u0020\u786c\u5e01\u3001\u5357\u74dc\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0032\u0030\u626d\u66f2\u003a\u0020\u4e0b\u86cb\u3001\u751f\u6210\u5e7b\u5f71\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0032\u0035\u626d\u66f2\u003a\u0020\u865a\u62df\u722c\u884c\u8005\u3001\u865a\u62df\u4e0b\u96e8\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0033\u0030\u626d\u66f2\u003a\u0020\u865a\u62df\u0047\u0054\u97f3\u6548\u3001\u751f\u6210\u8759\u8760\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0033\u0035\u626d\u66f2\u003a\u0020\u6d41\u8840\u3001\u865a\u62df\u672b\u5f71\u4eba\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0034\u0030\u626d\u66f2\u003a\u0020\u751f\u6210\u53cb\u65b9\u722c\u884c\u8005\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0034\u0035\u626d\u66f2\u003a\u0020\u8df3\u8dc3\u63d0\u5347\u3001\u53cd\u80c3\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0035\u0030\u626d\u66f2\u003a\u0020\u5931\u7720\u3001\u0056\u0069\u0073\u6d41\u5931");
 mods.thaumcraft.Research.addPage("WARPWARNING", "WARPTHEORY.research_page.WARPWARNING.4");
 game.setLocalization("WARPTHEORY.research_page.WARPWARNING.4", "\u0035\u0035\u626d\u66f2\u003a\u0020\u66b4\u98ce\u96e8\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0036\u0030\u626d\u66f2\u003a\u0020\u751f\u6210\u4e5d\u72f1\u7131\u8760\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0036\u0035\u626d\u66f2\u003a\u0020\u5931\u660e\u3001\u4e2d\u6bd2\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0037\u0030\u626d\u66f2\u003a\u0020\u7272\u755c\u4e4b\u96e8\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0037\u0035\u626d\u66f2\u003a\u0020\u751f\u6210\u5206\u8eab\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0038\u0030\u626d\u66f2\u003a\u0020\u751f\u6210\u672b\u5f71\u4eba\u3001\u51cb\u96f6\u6548\u679c\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0038\u0035\u626d\u66f2\u003a\u0020\u602a\u98ce\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0039\u0030\u626d\u66f2\u003a\u0020\u672b\u5f71\u73cd\u73e0\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0039\u0035\u626d\u66f2\u003a\u0020\u706b\u7403\u0026\u006c\u0074\u003b\u0042\u0052\u0026\u0067\u0074\u003b\u0031\u0030\u0030\u626d\u66f2\u003a\u0020\u5965\u672f\u77f3\u854a\u8bd5\u7eb8\u3001\u5783\u573e");