Commit graph

1105 commits

Author SHA1 Message Date
LexManos
3e1efdf05b Remerged branch, and updated dev eclipse workspace. 2012-12-08 17:08:51 -08:00
Christian
f4070ff625 Add in storage, detection and validation of the ItemID array between client and server
and also for world saves. May help with item configuration issues.
2012-12-08 17:05:18 -08:00
Christian
e6d66322fe Add a modid on the mods list, should make it easier to do things like forge chunkloading config 2012-12-08 16:46:47 -08:00
Christian
57fe3c475a Fix build eclipse extractor task 2012-12-08 16:46:46 -08:00
Christian
bccad16ea6 Add in storage, detection and validation of the ItemID array between client and server
and also for world saves. May help with item configuration issues.
2012-12-07 01:52:16 -05:00
Christian
d4b06fd4bc Add a modid on the mods list, should make it easier to do things like forge chunkloading config 2012-12-04 18:08:27 -05:00
Christian
7b7255013a Fix build eclipse extractor task 2012-12-04 18:04:45 -05:00
Christian
71044df76b Fix typo 2012-12-04 01:30:38 -05:00
Christian
edb4e08b22 Merge branch 'master' into repackage
Conflicts:
	eclipse/Clean/.classpath
	eclipse/Clean/.project
	eclipse/FML/.classpath
	eclipse/FML/.project
	install/fml.py
2012-12-04 01:24:50 -05:00
Christian
fa34555efa Try and make branch non-derpy 2012-12-03 23:47:23 -05:00
Christian
45583a7420 Try defaulting branch differently 2012-12-03 22:26:12 -05:00
Christian
e8ff9f25d9 Remove old eclipse workspace and ship/extract as a zip file (use ant setupenvironment)
Fix up install.py for forge multibranch changes
2012-12-03 19:55:37 -05:00
LexManos
61a90e9e74 Assume Forge is the parent directory when checking for AT configs. 2012-12-03 16:53:03 -08:00
Christian
9cdbadb66c Merge branch 'master' into repackage
Conflicts:
	patches/minecraft/net/minecraft/client/EntityFX.java.patch
2012-12-03 17:31:29 -05:00
Christian
6fdf5960ef Name both zips the same format 2012-12-03 08:38:20 -05:00
Christian
329fe50b1d Last part of branch name only please 2012-12-03 08:30:44 -05:00
Christian
461173a778 Try and get a valid branch name on jenkins 2012-12-03 08:23:21 -05:00
Christian
16418dd7ad Clean up build.xml script- support outputting a branched jar file 2012-12-03 08:13:20 -05:00
LexManos
e334a469fb Small derp in install.py 2012-12-02 20:26:36 -08:00
LexManos
d583a760ec Try marking python as binary. 2012-12-02 20:19:55 -08:00
LexManos
c584d4e3db FML will now attempt to download MCP as part of the install process
Now shipping a py2exe version of python for windows.
Linux/Macs should come with python pre-installed so they do not have a distrabution here.
2012-12-02 19:59:22 -08:00
LexManos
5cf07b008e Windows Python distrabution created using py2exe, thanks Fesh0r for the script. 2012-12-02 19:56:17 -08:00
LexManos
adad5c96cf Marked more spots in gui/items bitmask as being free. 2012-11-21 15:58:04 -08:00
LexManos
10cdc06cc3 Delete duplicate file 2012-11-20 18:07:39 -08:00
LexManos
78ff6182fe Finished repackaging net.minecraft.* net.minecraft.client is left 2012-11-20 17:58:22 -08:00
LexManos
7fb23bf89f More re-packaging, got most classes out of the default package. 2012-11-20 17:22:55 -08:00
Christian
25a10d6fc4 Fix up MCP version 2012-11-20 08:47:14 -05:00
Christian
389608116f Merge joined.exc add update howto 2012-11-20 08:38:33 -05:00
Christian
f74b8ac30b Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."
This reverts commit fa567014a54b3273002fe9cf424ab4cf3ec54c3a.
2012-11-20 08:27:13 -05:00
LexManos
554d86f59b Remove common folder from projects 2012-11-20 03:15:45 -08:00
LexManos
f75bf90e77 Move IBossDisplayData to shared 2012-11-20 03:15:16 -08:00
LexManos
8b1ed2d255 First half of new patches 2012-11-20 03:15:01 -08:00
LexManos
586807c2c8 Update FML imports 2012-11-20 03:14:36 -08:00
LexManos
73a22bb571 Inital script side commit for MC source repackaging done. 2012-11-20 01:55:41 -08:00
LexManos
397d36e900 Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config. 2012-11-19 17:45:53 -08:00
LexManos
745b697779 Forgot mcp.cfg 2012-11-19 15:47:18 -08:00
LexManos
950154aa61 Updated to 1.4.5b 2012-11-19 15:35:08 -08:00
LexManos
5e5919f61c Fix python error 2012-11-19 15:03:13 -08:00
LexManos
786b04c57d Modified decompile so that we do not have to decompile the server, saves time. 2012-11-19 15:01:04 -08:00
LexManos
72938c9133 Cleaned up some tabs 2012-11-19 15:00:11 -08:00
LexManos
f842aa75bb Change usage of ZipFile, fixes issues with Mac's default instation of python. Also cleaned the python a little bit. 2012-11-19 13:33:22 -08:00
Christian
02b6904843 Attempt to fix a possible comodification risk 2012-11-18 20:40:48 -05:00
Christian
8025bf3a2c Change texturebinding to use the textureId directly rather than iconIndex
to determine if it needs to rebind the texture sheet
2012-11-18 08:45:25 -05:00
Christian
0340719ca2 Fix mod display list. Shouldn't be derpy anymore. 2012-11-17 23:51:14 -05:00
Christian
c445ab004b Fix World patch- workaround no longer required and leftovers are bad. 2012-11-17 23:44:53 -05:00
LexManos
8d26642a84 Cleaned up the AT config updater, should work for any setup of the MCP workspace now. 2012-11-17 19:08:47 -08:00
Christian
783926194e Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit. 2012-11-16 22:50:21 -05:00
Christian
e8c5b0791f Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious.
Fix NPE for FML crash report on server. Clean up dead patches.
2012-11-16 22:50:00 -05:00
Christian
1c9b59b405 Clean up a patch 2012-11-16 16:49:44 -05:00
Christian
719f5f2bde Update FML for MC 1.4.5 2012-11-16 16:31:06 -05:00