diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-15 12:28:14 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-15 12:28:14 +0200 |
| commit | 34474480f73ca5ab1c711d73bdb4bd809673e063 (patch) | |
| tree | 794ef12002b88e2f01b5f6d76c9c1f9b62a48961 | |
| parent | c3f2b2b49dc3911a377fd062908d4df78bd3e58d (diff) | |
| parent | 08c75fd813a4b48ba7a6b58391767161791c96e7 (diff) | |
| download | GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.tar.gz GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.tar.bz2 GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.zip | |
Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate
Conflicts:
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
src/main/java/gregtech/loaders/load/GT_FuelLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
108 files changed, 1768 insertions, 731 deletions
diff --git a/.gitignore b/.gitignore index 27501edac3..f427f51f8c 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,7 @@ local.properties .idea/ .idea_modules/ +classes/ /out/ gradle/wrapper/gradle-wrapper.properties @@ -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.<br /> +[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.<br /> +[Tinkers Gregworks](https://github.com/Vexatos/TinkersGregworks) Tinkers Construct Tools made with GT materials.<br /> +[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+)<br /> +[TecTech](https://github.com/Technus/TecTech)<br /> + +## Modpacks + +[Beyond Reality](https://www.atlauncher.com/pack/BeyondReality)<br /> +[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/)<br /> +[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387)<br /> +[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)<br />
\ No newline at end of file diff --git a/build.properties b/build.properties index f4dcfcfaaf..39279f1d74 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.30 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index ec240af840..e558ff06a5 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/ |