keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
936 commits 1 branch 2 tags 103 MiB
Commit graph

936 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian
16651d6994 Remove old NEI/CCC compatibility code and other classloading tweaks 2012-12-15 20:40:08 -05:00
LexManos
70b9cd6e1f Fix var name messup 2012-12-13 00:22:30 -08:00
LexManos
60b6913a87 Update released eclipse project to link BouncyCastle 2012-12-12 23:44:28 -08:00
Christian
1dcf3bfbdc Change ID management slightly. IDs are tracked by block type for itemblock items now. This means servers will need to update. 
Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
 2012-12-12 19:31:05 -05:00
Christian
d13187d689 Fix possible escape leakage.. 2012-12-12 19:31:05 -05:00
LexManos
238dcdd18d More robust eclipse workspace replacement 2012-12-12 14:31:07 -08:00
LexManos
1812016e29 Kill decompile if astyle is not found and set execution bits on mcp .sh files and astyle-osx 2012-12-11 21:47:45 -08:00
Christian
55dc3467de Change to download bouncy castle as well. We also finally properly use the downloaded libs 
even in vanilla code!
 2012-12-11 22:37:07 -05:00
Christian
229a501def Remove extraneous patch file 2012-12-11 20:37:12 -05:00
Christian
64226c3d7e Merge branch 'repackage' 
Conflicts:
	build.xml
	client/cpw/mods/fml/client/FMLClientHandler.java
	client/cpw/mods/fml/client/GuiIdMismatchScreen.java
	common/cpw/mods/fml/common/FMLCommonHandler.java
	common/cpw/mods/fml/common/IFMLSidedHandler.java
	common/cpw/mods/fml/common/network/ModIdMapPacket.java
	common/cpw/mods/fml/common/network/ModListResponsePacket.java
	common/cpw/mods/fml/common/registry/GameData.java
	common/cpw/mods/fml/common/registry/GameRegistry.java
	common/cpw/mods/fml/common/registry/ItemData.java
	common/cpw/mods/fml/common/registry/LanguageRegistry.java
	common/cpw/mods/fml/server/FMLServerHandler.java
	install/fml.py
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
	patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
 2012-12-11 14:58:38 -05:00
Christian
f97b330605 Merge branch 'repackage' of github.com:cpw/FML into repackage 
Conflicts:
	common/cpw/mods/fml/common/registry/GameData.java
 2012-12-11 14:49:23 -05:00
cpw
29348240fc Merge pull request #145 from pahimar/master 
More logging of loading files in LanguageRegistry
 2012-12-11 08:28:39 -08:00
pahimar
5ef0cbfc32 Update common/cpw/mods/fml/common/registry/LanguageRegistry.java 
Add in logging of what file failed to be loaded
 2012-12-11 11:27:05 -05:00
LexManos
65a8bbf9e7 Fix patches, rebased with HEAD 2012-12-10 15:37:48 -08:00
LexManos
9be4b14371 Remade python dist as 32-bit. 2012-12-10 15:26:15 -08:00
Christian
1c5b8ecb7b Fixing id map generation - should validate correctly now 2012-12-10 15:26:13 -08:00
LexManos
5753eb0738 Reenabled replacement of the eclipse folder. 2012-12-10 14:56:23 -08:00
LexManos
41e899dcea Remade python dist as 32-bit. 2012-12-10 14:56:05 -08:00
Christian
aee1a3f24d Fixing id map generation - should validate correctly now 2012-12-09 22:24:16 -05:00
Christian
3f383e2dc6 Fix up idmap code 2012-12-09 22:01:13 -05:00
LexManos
5e0af1f2cb Some derp protection in the workspace copy. 2012-12-09 02:20:21 -08:00
LexManos
00bdb3dc0b Removed remaining references to src/common 
Fixed eclipse workspace replacemnt on source dist
Cleanup some outputs
 2012-12-09 02:10:28 -08:00
LexManos
3537fb7f21 Updated build script to not use the mcp common directory as it doesn't exist anymore. 2012-12-08 21:41:51 -08:00
LexManos
099b8259a6 Fished moving out the rest of the default packaged classes to aproperiate packages. Updated patches and code to reflect. 2012-12-08 21:41:16 -08:00
LexManos
21c66eaf98 Updated the update_packages script to support different mcp locations 2012-12-08 21:40:39 -08:00
LexManos
1742abb139 Update fml_marker.cfg, Minecraft is now runnable! 2012-12-08 20:25:29 -08:00
LexManos
804e597aca Update all imports for repackaging. Branch is compileable. 2012-12-08 20:21:03 -08:00
LexManos
e63311b4d0 Some stragler patches 2012-12-08 19:34:35 -08:00
LexManos
b02f93aeed Updated patches to new packages. 2012-12-08 19:33:29 -08:00
LexManos
ded6b4667b Give new classes a distinct package to be moved from. 2012-12-08 17:50:14 -08:00
LexManos
2009c89bf7 Fixed 0.tree to actually refresh the workspace. 2012-12-08 17:35:11 -08:00
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