updating work space

This commit is contained in:
KitsuShadow
2015-07-28 23:26:17 -04:00
parent 00287a1f41
commit 28a22a6d43
35 changed files with 5176 additions and 4068 deletions

View File

@@ -38,7 +38,6 @@ INDEX VERSION 1.127+/home/kitsudesktop/Development/ForgeCraft/eclipse/.metadata/
3591913134.index 3591913134.index
135292806.index 135292806.index
1155683227.index 1155683227.index
208370467.index
944496423.index 944496423.index
742522455.index 742522455.index
62093115.index 62093115.index

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 490 B

View File

@@ -1,5 +1,5 @@
#Splash screen properties #Splash screen properties
#Sat Jul 25 13:29:59 EDT 2015 #Sat Jul 25 18:56:10 EDT 2015
logoTexture=textures/gui/title/mojang.png logoTexture=textures/gui/title/mojang.png
background=0xFFFFFF background=0xFFFFFF
font=0x0 font=0x0

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1480,3 +1480,9 @@
[13:29:56] [main/INFO] [LaunchWrapper]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker [13:29:56] [main/INFO] [LaunchWrapper]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker
[13:29:56] [main/INFO] [LaunchWrapper]: Loading tweak class name net.minecraftforge.gradle.tweakers.CoremodTweaker [13:29:56] [main/INFO] [LaunchWrapper]: Loading tweak class name net.minecraftforge.gradle.tweakers.CoremodTweaker
[13:29:56] [main/INFO] [LaunchWrapper]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker [13:29:56] [main/INFO] [LaunchWrapper]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker
[18:56:07] [main/INFO] [GradleStart]: Extra: []
[18:56:07] [main/INFO] [GradleStart]: Running with arguments: [--userProperties, {}, --assetsDir, /home/kitsudesktop/.gradle/caches/minecraft/assets, --assetIndex, 1.7.10, --accessToken, {REDACTED}, --version, 1.7.10, --tweakClass, cpw.mods.fml.common.launcher.FMLTweaker, --tweakClass, net.minecraftforge.gradle.tweakers.CoremodTweaker]
[18:56:07] [main/INFO] [LaunchWrapper]: Loading tweak class name cpw.mods.fml.common.launcher.FMLTweaker
[18:56:07] [main/INFO] [LaunchWrapper]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker
[18:56:07] [main/INFO] [LaunchWrapper]: Loading tweak class name net.minecraftforge.gradle.tweakers.CoremodTweaker
[18:56:07] [main/INFO] [LaunchWrapper]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker

View File

@@ -1,28 +1,26 @@
[13:29:57] [main/INFO]: Setting user: Player692 [18:56:08] [main/INFO]: Setting user: Player764
[13:29:58] [Client thread/INFO]: LWJGL Version: 2.9.1 [18:56:09] [Client thread/INFO]: LWJGL Version: 2.9.1
[13:29:59] [Client thread/ERROR]: Couldn't initialize twitch stream [18:56:10] [Client thread/ERROR]: Couldn't initialize twitch stream
[13:30:02] [Client thread/INFO]: Reloading ResourceManager: Default, FMLFileResourcePack:Forge Mod Loader, FMLFileResourcePack:Minecraft Forge, FMLFileResourcePack:ForgeCraft [18:56:11] [Client thread/INFO]: Reloading ResourceManager: Default, FMLFileResourcePack:Forge Mod Loader, FMLFileResourcePack:Minecraft Forge, FMLFileResourcePack:ForgeCraft
[13:30:03] [Sound Library Loader/INFO]: Sound engine started [18:56:12] [Sound Library Loader/INFO]: Sound engine started
[13:30:03] [Client thread/INFO]: Created: 1024x512 textures/blocks-atlas [18:56:13] [Client thread/INFO]: Created: 1024x512 textures/blocks-atlas
[13:30:03] [Client thread/INFO]: Created: 512x512 textures/items-atlas [18:56:13] [Client thread/INFO]: Created: 512x512 textures/items-atlas
[13:30:03] [Client thread/INFO]: Reloading ResourceManager: Default, FMLFileResourcePack:Forge Mod Loader, FMLFileResourcePack:Minecraft Forge, FMLFileResourcePack:ForgeCraft [18:56:13] [Client thread/INFO]: Reloading ResourceManager: Default, FMLFileResourcePack:Forge Mod Loader, FMLFileResourcePack:Minecraft Forge, FMLFileResourcePack:ForgeCraft
[13:30:04] [Client thread/INFO]: Created: 1024x512 textures/blocks-atlas [18:56:13] [Client thread/INFO]: Created: 1024x512 textures/blocks-atlas
[13:30:04] [Client thread/INFO]: Created: 512x512 textures/items-atlas [18:56:13] [Client thread/INFO]: Created: 512x512 textures/items-atlas
[13:30:05] [Sound Library Loader/INFO]: Sound engine started [18:56:14] [Sound Library Loader/INFO]: Sound engine started
[13:30:06] [Server thread/INFO]: Starting integrated minecraft server version 1.7.10 [18:56:18] [Server thread/INFO]: Starting integrated minecraft server version 1.7.10
[13:30:06] [Server thread/INFO]: Generating keypair [18:56:18] [Server thread/INFO]: Generating keypair
[13:30:07] [Server thread/INFO]: Preparing start region for level 0 [18:56:18] [Server thread/INFO]: Preparing start region for level 0
[13:30:07] [Server thread/INFO]: Changing view distance to 12, from 10 [18:56:19] [Server thread/INFO]: Changing view distance to 12, from 10
[13:30:07] [Server thread/INFO]: Player692[local:E:3d1176b5] logged in with entity id 86 at (-243.18071290580363, 71.0, 64.87583910846845) [18:56:19] [Server thread/INFO]: Player764[local:E:02750152] logged in with entity id 80 at (-243.18071290580363, 71.0, 64.87583910846845)
[13:30:07] [Server thread/INFO]: Player692 joined the game [18:56:19] [Server thread/INFO]: Player764 joined the game
[13:30:08] [Server thread/INFO]: Player692 has just earned the achievement [Taking Inventory] [18:56:21] [Server thread/INFO]: Player764 has just earned the achievement [Taking Inventory]
[13:30:08] [Client thread/INFO]: [CHAT] Player692 has just earned the achievement [Taking Inventory] [18:56:21] [Client thread/INFO]: [CHAT] Player764 has just earned the achievement [Taking Inventory]
[13:30:20] [Server thread/INFO]: [Player692: Set own game mode to Creative Mode] [19:05:27] [Client thread/INFO]: Stopping!
[13:30:20] [Client thread/INFO]: [CHAT] Your game mode has been updated [19:05:27] [Server thread/INFO]: Stopping server
[13:30:51] [Client thread/INFO]: Stopping! [19:05:27] [Server thread/INFO]: Saving players
[13:30:51] [Server thread/INFO]: Stopping server [19:05:27] [Server thread/INFO]: Saving worlds
[13:30:51] [Server thread/INFO]: Saving players [19:05:27] [Server thread/INFO]: Saving chunks for level 'Demo World'/Overworld
[13:30:51] [Server thread/INFO]: Saving worlds [19:05:27] [Server thread/INFO]: Saving chunks for level 'Demo World'/Nether
[13:30:51] [Server thread/INFO]: Saving chunks for level 'Demo World'/Overworld [19:05:27] [Server thread/INFO]: Saving chunks for level 'Demo World'/The End
[13:30:51] [Server thread/INFO]: Saving chunks for level 'Demo World'/Nether
[13:30:51] [Server thread/INFO]: Saving chunks for level 'Demo World'/The End

Binary file not shown.

View File

@@ -0,0 +1 @@
{"stat.playOneMinute":10945,"achievement.openInventory":1,"achievement.exploreAllBiomes":{"value":0,"progress":["Savanna"]}}

View File

@@ -193,5 +193,6 @@
"19b458ba-c952-3dc3-bceb-bb32067d178f": "Player213", "19b458ba-c952-3dc3-bceb-bb32067d178f": "Player213",
"dbc69dc4-5cc0-3e17-977d-029c3370c88b": "Player202", "dbc69dc4-5cc0-3e17-977d-029c3370c88b": "Player202",
"2854591c-b60f-3cde-b807-30391bb3ef3d": "Player655", "2854591c-b60f-3cde-b807-30391bb3ef3d": "Player655",
"92bdd514-4796-3d7d-b2d4-a03fc9628bd4": "Player779" "92bdd514-4796-3d7d-b2d4-a03fc9628bd4": "Player779",
"07f066df-e334-33b1-a24c-2ec414c5ef02": "Player764"
} }

View File

@@ -1,9 +0,0 @@
#Test Script
clear
git status
git add --all
echo "Enter commit message"
read COM
git commit -m $COM
git push

View File

@@ -1004,8 +1004,6 @@ public final class ModItems {
GameRegistry.registerItem(customIronShovelCase51 = new CustomIronShovel("customIronShovelCase51", customWoodNormal), "customIronShovelCase51"); GameRegistry.registerItem(customIronShovelCase51 = new CustomIronShovel("customIronShovelCase51", customWoodNormal), "customIronShovelCase51");
GameRegistry.registerItem(customIronShovelCase52 = new CustomIronShovel("customIronShovelCase52", customIronToolRodWeak), "customIronShovelCase52"); GameRegistry.registerItem(customIronShovelCase52 = new CustomIronShovel("customIronShovelCase52", customIronToolRodWeak), "customIronShovelCase52");
GameRegistry.registerItem(customIronShovel = new CustomIronShovel("customIronShovel", customWoodNormal), "customIronShovel"); GameRegistry.registerItem(customIronShovel = new CustomIronShovel("customIronShovel", customWoodNormal), "customIronShovel");
GameRegistry.registerItem(customStrongIronShovel = new CustomIronShovel("customStrongIronShovel", customWoodStrong), "customStrongIronShovel"); GameRegistry.registerItem(customStrongIronShovel = new CustomIronShovel("customStrongIronShovel", customWoodStrong), "customStrongIronShovel");
GameRegistry.registerItem(customWeakIronShovel = new CustomIronShovel("customWeakIronShovel", customWoodWeak), "customWeakIronShovel"); GameRegistry.registerItem(customWeakIronShovel = new CustomIronShovel("customWeakIronShovel", customWoodWeak), "customWeakIronShovel");