diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 02:51:38 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-05-13 02:51:38 +1000 |
| commit | 6e946c6cc26665c97dad880dec2b5604f0104a28 (patch) | |
| tree | d967abd48d2cb7659fbe1fcc9f9bcd4f68ef6863 /src/resources | |
| parent | 4d15336cfb84a61d7609d75c683f21ea084f47bb (diff) | |
| parent | ab4b246c65795d612d35a8ace09acfe53e4580b4 (diff) | |
| download | GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.tar.gz GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.tar.bz2 GT5-Unofficial-6e946c6cc26665c97dad880dec2b5604f0104a28.zip | |
Merge remote-tracking branch 'remotes/origin/VersionBump'
# Conflicts:
# src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
# src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
# src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/mcmod.info | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 3d2ec378b5..4a78322487 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-11-final", + "version": "1.7.0-prerelease-14-final", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", |