Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-19 17:57:19 +00:00
commit 39dc016908
23 files changed
+499 -97

No files matched your search

@@ -11,10 +11,12 @@ public class GeneratorsItems
{
public static final Item SolarPanel = new ItemMekanism().setUnlocalizedName("SolarPanel");
public static final ItemHohlraum Hohlraum = (ItemHohlraum)new ItemHohlraum().setUnlocalizedName("Hohlraum");
public static final Item TurbineBlade = new ItemMekanism().setUnlocalizedName("TurbineBlade");
public static void register()
{
GameRegistry.registerItem(SolarPanel, "SolarPanel");
GameRegistry.registerItem(Hohlraum, "Hohlraum");
GameRegistry.registerItem(TurbineBlade, "TurbineBlade");
}
}