aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-11-27 14:21:58 +1000
committerAlkalus <draknyte1@hotmail.com>2017-11-27 14:21:58 +1000
commit0ff311d1fa2d07965b140da6e1af1fee16b6a984 (patch)
tree93f817b75ebe23ce68faedf2034b5c3b8af73958 /src
parent2f23943b0c802ce4439ee166e7eb258bd93f0eea (diff)
downloadGT5-Unofficial-0ff311d1fa2d07965b140da6e1af1fee16b6a984.tar.gz
GT5-Unofficial-0ff311d1fa2d07965b140da6e1af1fee16b6a984.tar.bz2
GT5-Unofficial-0ff311d1fa2d07965b140da6e1af1fee16b6a984.zip
^ Version bump.
$ Final .08.33 fix.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java6
-rw-r--r--src/resources/mcmod.info2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 76a65ca4fe..2305886b97 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -40,7 +40,7 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
- public static final String VERSION = "1.6.97-release";
+ public static final String VERSION = "1.6.98-release";
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/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index cf48516354..1717218062 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -132,9 +132,9 @@ public class RecipeGen_Recycling implements Runnable{
public static ItemStack get(final OrePrefixes aPrefix, final Object aMaterial, final ItemStack aReplacement,
final long aAmount) {
- if (OrePrefixes.mPreventableComponents.contains(aPrefix) && aPrefix.mDisabledItems.contains(aMaterial)) {
- return aReplacement;
- }
+ /*if (OrePrefixes.mPreventableComponents.contains(aPrefix) && aPrefix.mDisabledItems.contains(aMaterial)) {
+ return aReplacement; //TODO
+ }*/
return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true);
}
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 9f12b3fae0..981f37b193 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
"credits": "",
"logoFile": "",
- "version": "1.6.97-release",
+ "version": "1.6.98-release",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/GTplusplus/wiki",
"updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",