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

Fix shit

Browse source
This commit is contained in:
Yulife 2016-07-13 16:52:01 +02:00
parent 505347a757
commit a83de3c459
5 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Wed Jul 02 15:54:47 CDT 2014
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

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

Binary file not shown.

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

@ -5,13 +5,8 @@ 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,11 +5,7 @@ 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;