From 062fb04b02b9291741fdc4e79441e07cedee8796 Mon Sep 17 00:00:00 2001
From: Bass <tudurap.com@gmail.com>
Date: Fri, 24 Dec 2021 18:49:07 +0000
Subject: Merge pull request #19 from GTNewHorizons/unified-build-script

GTNewHorizons/TecTech/pull/19 Update buildscript

Unify build script
---
 src/main/resources/mcmod.info | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index f7fc68f278..21ecee23f8 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,10 +1,10 @@
 [
 {
-  "modid": "tectech",
-  "name": "TecTech",
+  "modid": "${modId}",
+  "name": "${modName}",
   "description": "TecTech - Tec Technology Interdimensional! Replace UUMatter with something overly complicated and annoying! (GT5u Addon)",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "",
   "updateUrl": "",
   "authorList": ["_Technus_"],
-- 
cgit 


From 048b3f5fec7d0e04ec748a279c47734567d84678 Mon Sep 17 00:00:00 2001
From: GTNH-Afx237v7 <64365566+GTNH-Afx237v7@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:08:06 +0100
Subject: Adjust ultimate battery soldering alloy amount

see #9131
---
 .../tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index ba72375f80..85db52223c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -1384,7 +1384,7 @@ public class DreamCraftRecipeLoader implements Runnable {
                 ItemList.Circuit_Parts_DiodeASMD.get(64),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64),
         }, new FluidStack[]{
-                Materials.SolderingAlloy.getMolten(3760),
+                Materials.SolderingAlloy.getMolten(4608),
                 Materials.Naquadria.getMolten(9216),
                 new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000)
         }, ItemList.ZPM3.get(1), 4000, 1600000);
-- 
cgit