mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-22 13:19:52 +00:00
Merge remote-tracking branch 'origin/Cricket' into dev
Conflicts: src/main/java/com/cricketcraft/chisel/Chisel.java src/main/java/com/cricketcraft/chisel/Features.java src/main/java/com/cricketcraft/chisel/config/Configurations.java src/main/resources/assets/chisel/textures/items/chisel_obsidian.png
This commit is contained in:
commit
bf4ce506e5
11 files changed
+282
-389
No files matched your search
@@ -6,7 +6,6 @@ import com.cricketcraft.chisel.item.ItemCloudInABottle;
|
||||
import com.cricketcraft.chisel.item.ItemSmashingRock;
|
||||
import com.cricketcraft.chisel.item.ItemUpgrade;
|
||||
import com.cricketcraft.chisel.item.chisel.ItemChisel;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
|
||||
|
||||
@ObjectHolder(Chisel.MOD_ID)
|
||||
@@ -14,6 +13,7 @@ public final class ChiselItems {
|
||||
|
||||
public static final ItemChisel chisel = null;
|
||||
public static final ItemChisel diamondChisel = null;
|
||||
public static final ItemChisel obsidianChisel = null;
|
||||
public static final ItemCloudInABottle cloudinabottle = null;
|
||||
public static final ItemBallOMoss ballomoss = null;
|
||||
public static final ItemSmashingRock smashingrock = null;
|
||||
|
||||
Reference in new issue
Block a user