Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts: # src/main/java/techreborn/compat/CompatManager.java
This commit is contained in:
commit
0fdba82490
5 changed files with 453 additions and 0 deletions
|
@ -37,6 +37,7 @@ public class ModItems {
|
|||
public static Item rockCutter;
|
||||
public static Item lithiumBatpack;
|
||||
public static Item lapotronpack;
|
||||
public static Item lithiumBattery;
|
||||
public static Item omniTool;
|
||||
public static Item advancedDrill;
|
||||
public static Item lapotronicOrb;
|
||||
|
@ -101,6 +102,8 @@ public class ModItems {
|
|||
GameRegistry.registerItem(lithiumBatpack, "lithiumBatpack");
|
||||
lapotronpack = PoweredItem.createItem(ItemLapotronPack.class);
|
||||
GameRegistry.registerItem(lapotronpack, "lapotronPack");
|
||||
lithiumBattery = PoweredItem.createItem(ItemLithiumBattery.class);
|
||||
GameRegistry.registerItem(lithiumBattery, "lithiumBattery");
|
||||
lapotronicOrb = PoweredItem.createItem(ItemLapotronicOrb.class);
|
||||
GameRegistry.registerItem(lapotronicOrb, "lapotronicOrb");
|
||||
omniTool = PoweredItem.createItem(ItemOmniTool.class);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue