diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-09 02:30:44 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-09 02:30:58 +1000 |
| commit | f91432bfbbba3c217bec65407ab3fa601b7241b2 (patch) | |
| tree | f906efcd2a96f2f18912c83b4fe4ccae05b57579 /src | |
| parent | 413e039c481273e3e1c60767047fba81a6609ef2 (diff) | |
| download | GT5-Unofficial-f91432bfbbba3c217bec65407ab3fa601b7241b2.tar.gz GT5-Unofficial-f91432bfbbba3c217bec65407ab3fa601b7241b2.tar.bz2 GT5-Unofficial-f91432bfbbba3c217bec65407ab3fa601b7241b2.zip | |
% Changed Cyclotron recipes.
^ Version bump to Pre-8-final.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 28 | ||||
| -rw-r--r-- | src/resources/mcmod.info | 2 |
3 files changed, 18 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index fe291d1c68..de3b7914f1 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -48,7 +48,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.0-prerelease-7"; + public static final String VERSION = "1.7.0-prerelease-8-final"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 64df3ca43f..d3eada8a75 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -14,6 +14,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -1036,23 +1037,26 @@ public class RECIPES_Machines { RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(Casing_Amount); RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1); - RecipeUtils.recipeBuilder( - "plateIncoloyMA956", "plateIncoloyMA956", "plateIncoloyMA956", - "plateIncoloyMA956", "frameGtIncoloy020", "plateIncoloyMA956", - "plateIncoloyMA956", "plateIncoloyMA956", "plateIncoloyMA956", - RECIPE_CyclotronOuterCasing); + GT_Values.RA.addAssemblerRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloyMA956", 8), + ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloy020", 1), + FluidUtils.getFluidStack("molten.hg1223", 32), + RECIPE_CyclotronOuterCasing, + 30 * 20, + 500); - RecipeUtils.recipeBuilder( - "plateIncoloy020", "plateIncoloy020", "plateIncoloy020", - "plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020", - "plateIncoloy020", "plateIncoloy020", "plateIncoloy020", - RECIPE_CyclotronInnerCoil); - + GT_Values.RA.addAssemblerRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloyDS", 16), + ItemList.Field_Generator_HV.get(1), + FluidUtils.getFluidStack("molten.hg1223", 144), + RECIPE_CyclotronInnerCoil, + 90 * 20, + 1000); RecipeUtils.recipeBuilder( "plateIncoloy020", CI.getTieredCircuit(6), "plateIncoloy020", RECIPE_CyclotronInnerCoil, CI.machineHull_IV, RECIPE_CyclotronInnerCoil, - "plateIncoloy020", "gearIncoloyMA956", "plateIncoloy020", + "plateIncoloy020", "gearGtIncoloyMA956", "plateIncoloy020", RECIPE_CyclotronController); } diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 7191ff5452..bf457a9527 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.", "credits": "", "logoFile": "", - "version": "1.7.0-prerelease-7", + "version": "1.7.0-prerelease-8-final", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", |