Rebase

2012-08-01 17:39:24 -07:00 · 2012-08-01 17:39:24 -07:00 · 6eb4353b95
commit 6eb4353b95
parent b9d3497b60
345 changed files with 4 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,4 @@
-/*
-!/forge
+/fml/
+/logs/
+/*.pyc
+/forge-*/
--- a/forge/bin/diff.exe
+++ b/forge/bin/diff.exe
--- a/forge/bin/find.exe
+++ b/forge/bin/find.exe
--- a/forge/bin/grep.exe
+++ b/forge/bin/grep.exe
--- a/forge/bin/libiconv2.dll
+++ b/forge/bin/libiconv2.dll
--- a/forge/bin/libintl3.dll
+++ b/forge/bin/libintl3.dll
--- a/forge/bin/mkdir.exe
+++ b/forge/bin/mkdir.exe
--- a/forge/bin/pcre3.dll
+++ b/forge/bin/pcre3.dll
--- a/forge/bin/regex2.dll
+++ b/forge/bin/regex2.dll
--- a/forge/bin/sed.exe
+++ b/forge/bin/sed.exe
--- a/forge/bin/tr.exe
+++ b/forge/bin/tr.exe
--- a/forge/build.bat
+++ b/forge/build.bat
--- a/forge/build.py
+++ b/forge/build.py
--- a/forge/build.sh
+++ b/forge/build.sh
--- a/forge/conf/astyle.cfg
+++ b/forge/conf/astyle.cfg
--- a/forge/conf/client.exc
+++ b/forge/conf/client.exc
--- a/forge/conf/client.srg
+++ b/forge/conf/client.srg
--- a/forge/conf/fields.csv
+++ b/forge/conf/fields.csv
--- a/forge/conf/mcp.cfg
+++ b/forge/conf/mcp.cfg
--- a/forge/conf/methods.csv
+++ b/forge/conf/methods.csv
--- a/forge/conf/params.csv
+++ b/forge/conf/params.csv
--- a/forge/conf/patches/Start.java
+++ b/forge/conf/patches/Start.java
--- a/forge/conf/patches/gk.java
+++ b/forge/conf/patches/gk.java
--- a/forge/conf/patches/minecraft.patch
+++ b/forge/conf/patches/minecraft.patch
--- a/forge/conf/patches/minecraft_ff.patch
+++ b/forge/conf/patches/minecraft_ff.patch
--- a/forge/conf/patches/minecraft_osx.patch
+++ b/forge/conf/patches/minecraft_osx.patch
--- a/forge/conf/patches/minecraft_server.patch
+++ b/forge/conf/patches/minecraft_server.patch
--- a/forge/conf/patches/minecraft_server_ff.patch
+++ b/forge/conf/patches/minecraft_server_ff.patch
--- a/forge/conf/patches/minecraft_server_osx.patch
+++ b/forge/conf/patches/minecraft_server_osx.patch
--- a/forge/conf/patches/splashes.txt
+++ b/forge/conf/patches/splashes.txt
--- a/forge/conf/server.exc
+++ b/forge/conf/server.exc
--- a/forge/conf/server.srg
+++ b/forge/conf/server.srg
--- a/forge/conf/version.cfg
+++ b/forge/conf/version.cfg
--- a/forge/fml-src-2.2.106.176.zip
+++ b/forge/fml-src-2.2.106.176.zip
--- a/forge/forge.py
+++ b/forge/forge.py
--- a/forge/.gitignore
+++ b/forge/.gitignore
@ -1,4 +0,0 @@
-/fml/
-/logs/
-/*.pyc
-/forge-*/
--- a/forge/forge_client/.classpath
+++ b/forge/forge_client/.classpath
--- a/forge/forge_client/.gitignore
+++ b/forge/forge_client/.gitignore
--- a/forge/forge_client/.project
+++ b/forge/forge_client/.project
--- a/forge/forge_client/src/forge_logo.png
+++ b/forge/forge_client/src/forge_logo.png
--- a/forge/forge_client/src/ibxm/Channel.java
+++ b/forge/forge_client/src/ibxm/Channel.java
--- a/forge/forge_client/src/ibxm/Envelope.java
+++ b/forge/forge_client/src/ibxm/Envelope.java
--- a/forge/forge_client/src/ibxm/FastTracker2.java
+++ b/forge/forge_client/src/ibxm/FastTracker2.java
--- a/forge/forge_client/src/ibxm/IBXM.java
+++ b/forge/forge_client/src/ibxm/IBXM.java
--- a/forge/forge_client/src/ibxm/Instrument.java
+++ b/forge/forge_client/src/ibxm/Instrument.java
--- a/forge/forge_client/src/ibxm/LogTable.java
+++ b/forge/forge_client/src/ibxm/LogTable.java
--- a/forge/forge_client/src/ibxm/Module.java
+++ b/forge/forge_client/src/ibxm/Module.java
--- a/forge/forge_client/src/ibxm/Pattern.java
+++ b/forge/forge_client/src/ibxm/Pattern.java
--- a/forge/forge_client/src/ibxm/Player.java
+++ b/forge/forge_client/src/ibxm/Player.java
--- a/forge/forge_client/src/ibxm/ProTracker.java
+++ b/forge/forge_client/src/ibxm/ProTracker.java
--- a/forge/forge_client/src/ibxm/Sample.java
+++ b/forge/forge_client/src/ibxm/Sample.java
--- a/forge/forge_client/src/ibxm/ScreamTracker3.java
+++ b/forge/forge_client/src/ibxm/ScreamTracker3.java
--- a/forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/EnumHelperClient.java
--- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java
--- a/forge/forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/GuiControlsScrollPanel.java
--- a/forge/forge_client/src/net/minecraft/src/forge/GuiMissingMods.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/GuiMissingMods.java
--- a/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/IArmorTextureProvider.java
--- a/forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/IHighlightHandler.java
--- a/forge/forge_client/src/net/minecraft/src/forge/IItemRenderer.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/IItemRenderer.java
--- a/forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/IRenderContextHandler.java
--- a/forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.java
--- a/forge/forge_client/src/net/minecraft/src/forge/ISoundHandler.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/ISoundHandler.java
--- a/forge/forge_client/src/net/minecraft/src/forge/ITextureLoadHandler.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/ITextureLoadHandler.java
--- a/forge/forge_client/src/net/minecraft/src/forge/ItemRenderType.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/ItemRenderType.java
--- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java
--- a/forge/forge_client/src/net/minecraft/src/forge/ModCompatibilityClient.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/ModCompatibilityClient.java
--- a/forge/forge_client/src/net/minecraft/src/forge/PacketHandlerClient.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/PacketHandlerClient.java
--- a/forge/forge_client/src/net/minecraft/src/forge/adaptors/SoundHandlerAdaptor.java
+++ b/forge/forge_client/src/net/minecraft/src/forge/adaptors/SoundHandlerAdaptor.java
--- a/forge/forge_client/src/net/minecraft/src/mod_MinecraftForge.java
+++ b/forge/forge_client/src/net/minecraft/src/mod_MinecraftForge.java
--- a/forge/forge_client/src/paulscode/sound/codecs/CodecIBXM.java
+++ b/forge/forge_client/src/paulscode/sound/codecs/CodecIBXM.java
--- a/forge/forge_common/mod_MinecraftForge.info
+++ b/forge/forge_common/mod_MinecraftForge.info
--- a/forge/forge_common/net/minecraft/src/forge/AchievementPage.java
+++ b/forge/forge_common/net/minecraft/src/forge/AchievementPage.java
--- a/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java
+++ b/forge/forge_common/net/minecraft/src/forge/ArmorProperties.java
--- a/forge/forge_common/net/minecraft/src/forge/Configuration.java
+++ b/forge/forge_common/net/minecraft/src/forge/Configuration.java
--- a/forge/forge_common/net/minecraft/src/forge/DimensionManager.java
+++ b/forge/forge_common/net/minecraft/src/forge/DimensionManager.java
--- a/forge/forge_common/net/minecraft/src/forge/DungeonLoot.java
+++ b/forge/forge_common/net/minecraft/src/forge/DungeonLoot.java
--- a/forge/forge_common/net/minecraft/src/forge/EntityTrackerInfo.java
+++ b/forge/forge_common/net/minecraft/src/forge/EntityTrackerInfo.java
--- a/forge/forge_common/net/minecraft/src/forge/EnumHelper.java
+++ b/forge/forge_common/net/minecraft/src/forge/EnumHelper.java
--- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java
+++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java
--- a/forge/forge_common/net/minecraft/src/forge/IArrowLooseHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IArrowLooseHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IArrowNockHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IArrowNockHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IBonemealHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IBucketHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IChatHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IChatHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IChunkLoadHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java
+++ b/forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java
--- a/forge/forge_common/net/minecraft/src/forge/IConnectionHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IConnectionHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/ICraftingHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IDestroyToolHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IEntityInteractHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IEntityInteractHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IEntityLivingHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IEntityLivingHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IFuelHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IFuelHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IGuiHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IGuiHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IHoeHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IHoeHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IMinecartCollisionHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IMinecartCollisionHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IMinecartHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IMinecartHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java
+++ b/forge/forge_common/net/minecraft/src/forge/IMultipassRender.java
--- a/forge/forge_common/net/minecraft/src/forge/IOreHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IOreHandler.java
--- a/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java
+++ b/forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java
--- a/forge/forge_common/net/minecraft/src/forge/IPacketHandler.java
+++ b/forge/forge_common/net/minecraft/src/forge/IPacketHandler.java
--- a/Show more
+++ b/Show more