MinecraftForge

0 Fork 0

mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00

T

Christian 5eafb71083 Merge branch 'master' into minecraft1.3

Bring some of the ticking fixes in

Conflicts:
	client/cpw/mods/fml/client/FMLClientHandler.java
	patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch

2012-07-05 15:30:21 -04:00

.settings

Mod sorting

2012-04-03 12:03:21 -04:00

bukkit

And there are not 1000 seconds in a second

2012-06-28 08:31:32 -04:00

client

Merge branch 'master' into minecraft1.3

2012-07-05 15:30:21 -04:00

clientdrop

Starting to get somewhere

2012-03-30 01:12:59 -04:00

common/cpw/mods/fml

Merge branch 'master' into minecraft1.3

2012-07-05 15:30:21 -04:00

eclipse

Got the relauncher downloading and injecting library files

2012-07-05 15:23:37 -04:00

install

Update credits information

2012-06-02 11:45:47 -04:00

patches

Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb.

2012-07-03 22:39:35 -04:00

server

Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb.

2012-07-03 22:39:35 -04:00

test/cpw/mods/fml/test

ModSorting test case

2012-06-21 21:56:16 -04:00

.classpath

Forge support

2012-04-01 02:14:14 -04:00

.gitignore

Fix problem with nulls in getModList

2012-05-11 15:18:26 -04:00

.project

Update to 1.2.5 and hopefully forge compatibility

2012-04-02 18:09:06 -04:00

applypatches.py

Clean up extraneous print statements from the build

2012-04-05 10:42:15 -04:00

build.xml

Got the relauncher downloading and injecting library files

2012-07-05 15:23:37 -04:00

cleanup_source.py

Fixed regex issue in last push.

2012-05-27 01:40:22 -07:00

diff.exe

Cleaned up update_patches to fix a few bugs. Updated applypatches to normalize the patch file's line endings to make them work cross platform. Added download_firnflower and setup script. As well as added the GnuWin32's diff binary, so windows can create patches as well. http://gnuwin32.sourceforge.net/

2012-04-05 00:09:29 -07:00

download_fernflower.py

Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of

2012-07-02 15:54:25 -04:00

fmlbuild.properties-sample

Add in more ignore stuff and a sample "fmlbuild.properties" file

2012-03-30 16:42:11 -04:00

generatechangedfilelist.py

difflist should include server and client now.

2012-05-24 03:48:59 -07:00

getversion.py

Harvest MC version from MCP

2012-07-02 13:31:45 -04:00

LICENSE-fml.txt

Missed a couple of wording tweaks

2012-04-05 00:58:17 -04:00

setup.bat

Should fix windows {me} generating different patches then linux {cpw}

2012-05-27 00:22:27 -07:00

update_patches.bat

2012-04-05 00:09:29 -07:00

update_patches.py

Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of

2012-07-02 15:54:25 -04:00

update_patches.sh

Add the hooks for crafting and smelting

2012-04-06 10:34:44 -04:00