Anvilcraft/ModTweaker
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

damn merge issues

Browse source
This commit is contained in:
Jared 2016-07-12 14:25:09 +02:00
commit 505347a757
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
libs/CraftTweaker-Dev-1.9-3.0.9.jar Normal file
View file

Binary file not shown.

5
src/main/java/modtweaker2/helpers/InputHelper.java
View file

@ -5,8 +5,13 @@ import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDictEntry;
<<<<<<< HEAD
import minetweaker.mc1102.item.MCItemStack;
import minetweaker.mc1102.liquid.MCLiquidStack;
=======
import minetweaker.mc19.item.MCItemStack;
import minetweaker.mc19.liquid.MCLiquidStack;
>>>>>>> 1.9
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;

4
src/main/java/modtweaker2/helpers/LogHelper.java
View file

@ -5,7 +5,11 @@ import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.api.player.IPlayer;
<<<<<<< HEAD
import minetweaker.mc1102.item.MCItemStack;
=======
import minetweaker.mc19.item.MCItemStack;
>>>>>>> 1.9
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;