nmd/PrimalEnergy
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gitignore

Browse Source
This commit is contained in:
Fluid1C3
2015-08-11 19:26:16 -05:00
parent a6263542e9
commit 6689f0d9bb
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -9,3 +9,6 @@ eclipse
gradle/* gradle/*
gradle gradle
.settings/* .settings/*
config
logs
eula.txt

5
src/main/java/nmd/primal/energy/Main.java
View File

@@ -25,8 +25,6 @@ public class Main
// some example code // some example code
//System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName()); //System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
} }
<<<<<<< HEAD
=======
@EventHandler @EventHandler
public void postInit(FMLPostInitializationEvent e) { public void postInit(FMLPostInitializationEvent e) {
@@ -34,7 +32,4 @@ public class Main
System.out.println("U want some Body Massage?"); System.out.println("U want some Body Massage?");
//RenderingRegistry.registerEntityRenderingHandler(EntityShit.class, new RenderSnowball(ModItems.itemShit)); //RenderingRegistry.registerEntityRenderingHandler(EntityShit.class, new RenderSnowball(ModItems.itemShit));
} }
//Fluids comment
>>>>>>> 71867cff5f48b73b986b837d8f6e04f57d3ee247
} }