diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-07-08 23:59:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 23:59:09 +0200 |
| commit | 17402e6c3de5657f625bbb3430bd88ac687319f0 (patch) | |
| tree | 3e07f9751c63d0a036e81716fb998e9862bd0a39 /src | |
| parent | f087ad8e16e27b8e06298cdbd6f93114ce692a01 (diff) | |
| parent | 3c68ec3be1249dc9fc13c55921f1d203341200eb (diff) | |
| download | GT5-Unofficial-17402e6c3de5657f625bbb3430bd88ac687319f0.tar.gz GT5-Unofficial-17402e6c3de5657f625bbb3430bd88ac687319f0.tar.bz2 GT5-Unofficial-17402e6c3de5657f625bbb3430bd88ac687319f0.zip | |
Merge pull request #6 from Mr-Vovikpro123/master
Fix UEV energy hatch research conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 998be3b251..b679d3cff8 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 @@ -1096,7 +1096,7 @@ public class DreamCraftRecipeLoader implements Runnable { getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 16000000); //UMV Energy Hatch - TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UEV").get(1L), + TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UIV").get(1L), 192000, 128, 400000, 16, new Object[]{ getItemContainer("Hull_UMV").get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 16L), |