Skip to content

Commit

Permalink
Merge pull request #2 from Ethryan/1.7.10
Browse files Browse the repository at this point in the history
The removal of the recipes for cosmic neutronium
  • Loading branch information
Dream-Master authored Jul 25, 2017
2 parents 5d38240 + 8245ebe commit 22c8851
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "1.13"
version = "1.14"
group= "fox.spiteful.avaritia" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Avaritia"

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fox/spiteful/avaritia/compat/ticon/Tonkers.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static void buildstruct() {
pb.registerFullMaterial(new ItemStack(LudicrousItems.resource, 1, 4), 2, neutroniumName, new ItemStack(TinkerTools.toolShard, 1, neutroniumId), new ItemStack(TinkerTools.toolRod, 1, neutroniumId), neutroniumId);

// register patterns
for (int m = 0; m < TinkerTools.patternOutputs.length; m++)
/*for (int m = 0; m < TinkerTools.patternOutputs.length; m++)
{
if (TinkerTools.patternOutputs[m] != null)
TConstructRegistry.addPartMapping(TinkerTools.woodPattern, m + 1, neutroniumId, new ItemStack(TinkerTools.patternOutputs[m], 1, neutroniumId));
Expand All @@ -59,11 +59,11 @@ public static void buildstruct() {
TConstructRegistry.addPartMapping(TinkerWeaponry.woodPattern, m, neutroniumId, new ItemStack(TinkerWeaponry.patternOutputs[m], 1, neutroniumId));
}
TConstructRegistry.addPartMapping(TinkerTools.woodPattern, 25, neutroniumId, new ItemStack(TinkerWeaponry.arrowhead, 1, neutroniumId));

*/
TonkersEvents events = new TonkersEvents();
MinecraftForge.EVENT_BUS.register(events);
FMLCommonHandler.instance().bus().register(events);

// recipes
ItemStack ingot = new ItemStack(LudicrousItems.resource, 1, 6);

Expand Down

0 comments on commit 22c8851

Please sign in to comment.