From dad36f6c484fee92c3c9cd7d8d9c3ecf31e5c472 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Thu, 1 Jun 2017 21:21:27 +0200 Subject: Added links to Addons and modpacks to readme --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index db772d4f1f..e81041e843 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,18 @@ Please report any issues you to find the issue tracker on this repository. Inclu ## Contribution Please do! However, please take a note of current issues and what is currently being worked on. + +## Addons + +[Gregtech++](https://forum.industrial-craft.net/thread/13325-gt5u-1-7-10-gregtech-add-s-many-new-machines-multiblocks-general-xmod-compat-wit/)Misc GT additions. +[GTTweaker](https://forum.industrial-craft.net/thread/11353-gt-5-09-minetweaker-3-10-addon-addon-version-1-6-1-adding-custom-recipes-for-all/)Minetweaker Addon for GregTech. +[Tinkers Gregworks](https://github.com/Vexatos/TinkersGregworks) Tinkers Construct Tools made with GT materials. +[GalacticGreg](https://forum.industrial-craft.net/thread/11039-gregtech-addon-addon-galacticgreg-1-9-gregtech-oregen-on-galacticraft-planets/) GregTech Worldgen on Galacticraft Planets (Directly integrated into GT5.09.23+) +[TecTech](https://github.com/Technus/TecTech) + +## Modpacks + +[Beyond Reality](https://www.atlauncher.com/pack/BeyondReality) +[Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/) +[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387) +[Ideal Industrial Assembly](https://yadi.sk/d/m0vmhfXyyBE7G) \ No newline at end of file -- cgit From 8342537d8c0fb7519b10cc06e2aba661deb587e9 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Thu, 1 Jun 2017 21:23:34 +0200 Subject: Add newlines --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index e81041e843..b4ee3675f8 100644 --- a/README.md +++ b/README.md @@ -25,15 +25,15 @@ Please do! However, please take a note of current issues and what is currently b ## Addons -[Gregtech++](https://forum.industrial-craft.net/thread/13325-gt5u-1-7-10-gregtech-add-s-many-new-machines-multiblocks-general-xmod-compat-wit/)Misc GT additions. -[GTTweaker](https://forum.industrial-craft.net/thread/11353-gt-5-09-minetweaker-3-10-addon-addon-version-1-6-1-adding-custom-recipes-for-all/)Minetweaker Addon for GregTech. -[Tinkers Gregworks](https://github.com/Vexatos/TinkersGregworks) Tinkers Construct Tools made with GT materials. -[GalacticGreg](https://forum.industrial-craft.net/thread/11039-gregtech-addon-addon-galacticgreg-1-9-gregtech-oregen-on-galacticraft-planets/) GregTech Worldgen on Galacticraft Planets (Directly integrated into GT5.09.23+) -[TecTech](https://github.com/Technus/TecTech) +[Gregtech++](https://forum.industrial-craft.net/thread/13325-gt5u-1-7-10-gregtech-add-s-many-new-machines-multiblocks-general-xmod-compat-wit/)Misc GT additions.
+[GTTweaker](https://forum.industrial-craft.net/thread/11353-gt-5-09-minetweaker-3-10-addon-addon-version-1-6-1-adding-custom-recipes-for-all/)Minetweaker Addon for GregTech.
+[Tinkers Gregworks](https://github.com/Vexatos/TinkersGregworks) Tinkers Construct Tools made with GT materials.
+[GalacticGreg](https://forum.industrial-craft.net/thread/11039-gregtech-addon-addon-galacticgreg-1-9-gregtech-oregen-on-galacticraft-planets/) GregTech Worldgen on Galacticraft Planets (Directly integrated into GT5.09.23+)
+[TecTech](https://github.com/Technus/TecTech)
## Modpacks -[Beyond Reality](https://www.atlauncher.com/pack/BeyondReality) -[Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/) -[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387) -[Ideal Industrial Assembly](https://yadi.sk/d/m0vmhfXyyBE7G) \ No newline at end of file +[Beyond Reality](https://www.atlauncher.com/pack/BeyondReality)
+[Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/)
+[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387)
+[Ideal Industrial Assembly](https://yadi.sk/d/m0vmhfXyyBE7G)
\ No newline at end of file -- cgit From 18c92489fdabdfbbe6fcc77afcda428483877a44 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Fri, 2 Jun 2017 12:17:56 +0200 Subject: Update Modpack info --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index b4ee3675f8..42a1175905 100644 --- a/README.md +++ b/README.md @@ -36,4 +36,4 @@ Please do! However, please take a note of current issues and what is currently b [Beyond Reality](https://www.atlauncher.com/pack/BeyondReality)
[Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/)
[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387)
-[Ideal Industrial Assembly](https://yadi.sk/d/m0vmhfXyyBE7G)
\ No newline at end of file +[Идеальная Индустраяльная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)
\ No newline at end of file -- cgit From e3b3fd66f19d076fa841ad1da0e05bbb6605f4e3 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Fri, 2 Jun 2017 12:36:31 +0200 Subject: Fix compressed meteoric iron recipe. #1071 --- README.md | 2 +- build.properties | 2 +- src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 42a1175905..33c4e0faf8 100644 --- a/README.md +++ b/README.md @@ -36,4 +36,4 @@ Please do! However, please take a note of current issues and what is currently b [Beyond Reality](https://www.atlauncher.com/pack/BeyondReality)
[Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/)
[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387)
-[Идеальная Индустраяльная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)
\ No newline at end of file +[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)
\ No newline at end of file diff --git a/build.properties b/build.properties index f4dcfcfaaf..29f39ddd62 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.30pre1 +gt.version=5.09.30pre2 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 2e00133a69..64a8edaa5b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -85,7 +85,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.mFuelPower > 0) GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, aMaterial.mFuelPower, aMaterial.mFuelType); GT_Utility.removeSimpleIC2MachineRecipe(GT_Utility.copyAmount(9L, new Object[]{aStack}), GT_ModHandler.getCompressorRecipeList(), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)); - GT_Values.RA.addImplosionRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), 2, GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); + GT_Values.RA.addImplosionRecipe(GT_Utility.copyAmount(aMaterial == Materials.MeteoricIron ? 1 : 2, new Object[]{aStack}), 2, GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), GT_Proxy.tBits, new Object[]{"hX", 'X', OrePrefixes.plate.get(aMaterial)}); if (aMaterial == Materials.Paper) -- cgit