Updating branch

1.11/banned-ips.json

@@ -0,0 +1 @@
+[]

1.11/banned-players.json

@@ -0,0 +1 @@
+[]

1.11/eula.txt

@@ -1,3 +1,3 @@
 #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
 #Sat Apr 01 13:44:13 EDT 2017
-eula=false
+eula=true

1.11/ops.json

@@ -0,0 +1 @@
+[]

1.11/server.properties

@@ -1,2 +1,38 @@
 #Minecraft server properties
-#Mon Feb 13 22:08:20 EST 2017
+#Tue Apr 04 17:37:36 EDT 2017
+max-tick-time=60000
+generator-settings=
+allow-nether=true
+force-gamemode=false
+gamemode=0
+enable-query=false
+player-idle-timeout=0
+difficulty=1
+spawn-monsters=true
+op-permission-level=4
+announce-player-achievements=true
+pvp=true
+snooper-enabled=true
+level-type=DEFAULT
+hardcore=false
+enable-command-block=false
+max-players=20
+network-compression-threshold=256
+resource-pack-sha1=
+max-world-size=29999984
+server-port=25565
+server-ip=
+spawn-npcs=true
+allow-flight=false
+level-name=world
+view-distance=10
+resource-pack=
+spawn-animals=true
+white-list=false
+generate-structures=true
+online-mode=true
+max-build-height=256
+level-seed=
+prevent-proxy-connections=false
+motd=A Minecraft Server
+enable-rcon=false

1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java

@@ -79,45 +79,14 @@ public class ModItems {
         ironhoe = new CustomHoe("ironhoe", ModMaterials.TOOL_WROUGHT_IRON);
 
         ironsword = new CustomSword("ironsword", ModMaterials.TOOL_WROUGHT_IRON);
-        //ironingotballcool = new BaseMultiItem("ironingotcool") {};
+
-        //test = new ItemTest("ironsword");
         matchlockmusket = new Musket("matchlock_musket");
 
         ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON);
         ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON);
-        /*ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON) {
+
-            public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-                if(!world.isRemote) {
-                    ItemStack itemstack = player.getHeldItem(hand);
-                    if (world.getBlockState(pos).getBlock() != ModBlocks.firebox) {
-                        BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ());
-                        if(world.getBlockState(tempPos).getBlock() == Blocks.AIR){
-                            world.setBlockState(tempPos, ModBlocks.ironball.getDefaultState().withProperty(IngotBall.ACTIVE, true), 3);
-                            itemstack.shrink(1);
-                            return EnumActionResult.SUCCESS;
-                        }
-                    }
-                }
-                return EnumActionResult.FAIL;
-            }
-        };
-        ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON) {
-            public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-                if(!world.isRemote) {
-                    ItemStack itemstack = player.getHeldItem(hand);
-                    if (world.getBlockState(pos).getBlock() != ModBlocks.firebox) {
-                        BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ());
-                        if(world.getBlockState(tempPos).getBlock() == Blocks.AIR){
-                            world.setBlockState(tempPos, ModBlocks.ironchunk.getDefaultState().withProperty(IngotBall.ACTIVE, true), 3);
-                            itemstack.shrink(1);
-                            return EnumActionResult.SUCCESS;
-                        }
-                    }
-                }
-                return EnumActionResult.FAIL;
-            }
-        };*/
         //forgingmanual = new ItemForgingManual();
+        //test = new ItemTest("ironsword");
     }
 
     public static void register() {

1.11/whitelist.json

@@ -0,0 +1 @@
+[]

push.sh

@@ -5,6 +5,7 @@ git status
 git add --all :/
 IFS= read -r -p "Enter commit message: " com
 git commit -m "${com}"
+echo $(git branch)
 IFS= read -r -p "Enter Branch name: " com1
 git push nmd ${com1}
 git push github ${com1}