Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
This commit is contained in:
modmuss50 2016-12-26 23:49:42 +00:00
commit 0922e0b886
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
10 changed files with 456 additions and 233 deletions

View file

@ -13,6 +13,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.api.fuel.FluidPowerManager;
import reborncore.api.recipe.RecipeHandler;
import techreborn.dev.JsonGenerator;
@ -88,6 +89,10 @@ public class TechRebornDevCommand extends CommandBase {
e.printStackTrace();
sender.sendMessage(new TextComponentString(e.getLocalizedMessage()));
}
} else if ("ores".equals(args[0])) {
for(String ore: OreDictionary.getOreNames()){
System.out.println(ore);
}
}
}
}