diff --git a/bin/gq/cestaberous/supernaturalflora/SupernaturalFlora.class b/bin/gq/cestaberous/supernaturalflora/SupernaturalFlora.class index f0d3952..c4f4eb9 100644 Binary files a/bin/gq/cestaberous/supernaturalflora/SupernaturalFlora.class and b/bin/gq/cestaberous/supernaturalflora/SupernaturalFlora.class differ diff --git a/eclipse/.metadata/.mylyn/.tasks.xml.zip b/eclipse/.metadata/.mylyn/.tasks.xml.zip index 3c5cd89..590f1fc 100644 Binary files a/eclipse/.metadata/.mylyn/.tasks.xml.zip and b/eclipse/.metadata/.mylyn/.tasks.xml.zip differ diff --git a/eclipse/.metadata/.mylyn/tasks.xml.zip b/eclipse/.metadata/.mylyn/tasks.xml.zip index 9a00f9a..fce9064 100644 Binary files a/eclipse/.metadata/.mylyn/tasks.xml.zip and b/eclipse/.metadata/.mylyn/tasks.xml.zip differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap index 3873ade..464a957 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap index 3873ade..464a957 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers.snap b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers.snap index 3873ade..464a957 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers.snap and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers.snap differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.syncinfo.snap b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.syncinfo.snap index 3873ade..464a957 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.syncinfo.snap and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.syncinfo.snap differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap index 1ecda35..9d0e10c 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 94eaeb6..b5b46bd 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/1.snap b/eclipse/.metadata/.plugins/org.eclipse.core.resources/1.snap index 5417344..216b0ed 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.core.resources/1.snap and b/eclipse/.metadata/.plugins/org.eclipse.core.resources/1.snap differ diff --git a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 8c1d0eb..aec90a3 100644 --- a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,18 +1,18 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration ModelMigrationProcessor.001 - + topLevel shellMaximized - - - + + + persp.actionSet:org.eclipse.mylyn.doc.actionSet persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation @@ -71,2185 +71,2185 @@ persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task persp.viewSC:org.eclipse.wb.core.StructureView persp.viewSC:org.eclipse.wb.core.PaletteView - - - + + + newtablook org.eclipse.e4.primaryNavigationStack - - - - - - - + + + + + + + - + newtablook - + - - - - - + + + + + newtablook - + - + newtablook org.eclipse.e4.secondaryNavigationStack - - - + + + - + newtablook org.eclipse.e4.secondaryDataStack - - - - - - - + + + + + + + - - - - + + + + - + View categoryTag:Help - + View categoryTag:General - + View categoryTag:Help - - + + newtablook org.eclipse.e4.primaryDataStack EditorStack active noFocus - - + + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide - + active + menuContribution:popup popup:#CompilationUnitEditorContext popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#CompilationUnitRulerContext popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + Editor org.eclipse.ui.DefaultTextEditor removeOnHide - + menuContribution:popup popup:#TextEditorContext popup:org.eclipse.ui.DefaultTextEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#TextRulerContext popup:org.eclipse.ui.DefaultTextEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide - + menuContribution:popup popup:#CompilationUnitEditorContext popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#CompilationUnitRulerContext popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide - + menuContribution:popup popup:#CompilationUnitEditorContext popup:org.eclipse.jdt.ui.CompilationUnitEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#CompilationUnitRulerContext popup:org.eclipse.jdt.ui.CompilationUnitEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + Editor org.eclipse.ui.DefaultTextEditor removeOnHide - active - + menuContribution:popup popup:#TextEditorContext popup:org.eclipse.ui.DefaultTextEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#TextRulerContext popup:org.eclipse.ui.DefaultTextEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + View categoryTag:Java - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.jdt.ui.PackageExplorer - + - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu - + - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.jdt.ui.outline - + menuContribution:popup popup:org.eclipse.jdt.ui.outline - + menuContribution:popup popup:org.eclipse.jdt.ui.outline - + - + View categoryTag:General - + View categoryTag:Ant - + View categoryTag:Git - + View categoryTag:Java - + View categoryTag:Mylyn - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.mylyn.tasks.ui.menus.activeTask - + menuContribution:popup popup:org.eclipse.mylyn.tasks.ui.views.tasks - + - + View categoryTag:WindowBuilder - + View categoryTag:WindowBuilder - - + + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Draggable - + Draggable - + toolbarSeparator - + - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + stretch SHOW_RESTORE_MENU - + Draggable HIDEABLE SHOW_RESTORE_MENU - - + + stretch - + Draggable - + Draggable - - + + - - - - - - - - - - - + + + + + + + + + + + platform:gtk - - - - - - + + + + + + platform:gtk - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - - - + + + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - + + + + + + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor - + View categoryTag:Ant - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:Debug - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Maven - + View categoryTag:Maven - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Code Recommenders - + View categoryTag:Code Recommenders - + View categoryTag:Code Recommenders - + View categoryTag:Code Recommenders - + View categoryTag:General - + View categoryTag:General - + View categoryTag:CVS - + View categoryTag:CVS - + View categoryTag:Team - + View categoryTag:Team - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:WindowBuilder - + View categoryTag:WindowBuilder - + View categoryTag:General - + View categoryTag:XML - + View categoryTag:XML - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index index 6d5adf5..4387882 100644 Binary files a/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index and b/eclipse/.metadata/.plugins/org.eclipse.jdt.core/208370467.index differ diff --git a/src/main/java/gq/cestaberous/supernaturalflora/SupernaturalFlora.java b/src/main/java/gq/cestaberous/supernaturalflora/SupernaturalFlora.java index d3910d6..04f39cf 100644 --- a/src/main/java/gq/cestaberous/supernaturalflora/SupernaturalFlora.java +++ b/src/main/java/gq/cestaberous/supernaturalflora/SupernaturalFlora.java @@ -151,7 +151,7 @@ public class SupernaturalFlora { GameRegistry.addRecipe(new ItemStack(Items.spawn_egg, 3, 51), "GMG", " M ", " S ", 'S', itemSiftingNet, 'M', itemSoulMedium, 'G', blockDeadSoilSkeleton); GameRegistry.addRecipe(new ItemStack(Items.spawn_egg, 3, 61), "GMG", " M ", " S ", 'S', itemSiftingNet, 'M', itemSoulMedium, 'G', blockDeadSoilBlaze); GameRegistry.addRecipe(new ItemStack(itemSiftingNet, 6), "SSS", "SSS", 'S', Items.string); - GameRegistry.addRecipe(new ItemStack(itemIronShard, 9), "I", 'I', Items.iron_ingot); + GameRegistry.addRecipe(new ItemStack(itemIronShard, 9), "I", "D", 'D', itemEtherealDivisor, 'I', Items.iron_ingot); GameRegistry.addRecipe(new ItemStack(itemEtherealDivisor, 2), "IM", 'I', itemIronShard, 'M', itemSoulMedium); GameRegistry.addRecipe(new ItemStack(itemEtherealDivisor, 2), "I", "M", 'I', itemIronShard, 'M', itemSoulMedium); GameRegistry.addRecipe(new ItemStack(itemObsidianIngot, 9), "D", "O", 'D', itemEtherealDivisor, 'O', Blocks.obsidian);