Commit graph

5838 commits

Author SHA1 Message Date
Christian
fc0fc0cc75 Fix the merge for forge 2012-10-23 18:36:05 -04:00
Christian
a3e71f4016 Fix up references to minecraftDir in obf code 2012-10-23 18:10:06 -04:00
Christian
6e8902da86 Update FML for Minecraft 1.4.1 2012-10-23 18:00:33 -04:00
LexManos
37697d7f44 First update to 1.4.1, patches need updating. 2012-10-23 14:44:04 -07:00
LexManos
54f5225530 Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading. 2012-10-23 13:32:02 -07:00
LexManos
717b80781b Fix color issues with Dyed Leather armor. 2012-10-23 05:24:36 -07:00
LexManos
5ca845f069 Fix up the setHandeled/setHandled for events, it is now a generalized setResult, the meaning of which is defined by each event. 2012-10-22 00:29:28 -07:00
LexManos
ad51183584 Cleanup mirrored things in ShapedOreRecipe to address issue 208 and issue 210 2012-10-21 23:19:11 -07:00
LexManos
a09ea82fc7 Remove deprecated code. 2012-10-21 23:18:09 -07:00
LexManos
dc9b1d90bd Fix NPE issue when mods add null EntityFX's to be rendererd. 2012-10-21 22:59:57 -07:00
Christian
9e86399aae Update FML: 7a34246
7a34246 Ship a client only class so the merge works both sides.
2012-10-21 23:09:04 -04:00
Christian
190c71eeb5 Ship a client only class so the merge works both sides. 2012-10-21 22:50:20 -04:00
Christian
4ee6852d4d Fix install.py so it can be installed properly from src distribution 2012-10-21 21:21:19 -04:00
Christian
b32aedacce Update FML (entire change log since last by me): 62a6b52
62a6b52 Fix RenderRegistry render ID - now at 36 Fix SpriteMaps - they're running out fast! Switch to forge if you can! RenderBiped now has an armo
b845cde Fix up FML python script for forge
2c36dfb Update to MCP pre 3. Fixes some weirdnesses with explosions.
acd880d Merge branch '1.4'
e6f57e5 Update for MCP release
b1de0fc Remove fuzz from patches for INetworkManager change
ad44619 Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use...
3a94211 Add a script to ignore git complaining about the eclipse workspace changing - run when you first open the eclipse workspace
9386e23 Update gitignore - ignore the files that will change or be deleted
10b318c Add in "starter" image for eclipse workspace
995d5b7 Eclipse workspace fixup 2?
bbb12c8 Clean up eclipse workspace- part 1
b50058e Clean up a bit of patch fuzz
4a0bfa9 Fix CommonHandler for rename of the server thread class
4d1ec66 Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it.
b52e3d0 Fix exception for CodecMus
a1011c9 Fix some compilation issues. Requires resolving the worldclient abstract method
0ebd4f3 Inital patch update to 1.4
89c68c4 Moved into EntityVillager
e4702cb Fix line ending detection during checkout.
6e64fd7 We don't need logging here...
014b3f4 remove useless -Server projects
7628c67 Updated the AT config and Marker config for 1.4 obf
54a322c Updae build to copy files that may decompile differently but are actually the same, and updated for 1.4 values.
aadf396 Update MCP Merge config.
81e1855 Pull in MCP's 1.4 conf files.
5686fd4 Fix error in merging of exec's
2012-10-21 20:56:56 -04:00
LexManos
1f1a7edebb Update release script for mcp changes, releases now build. 2012-10-21 10:39:05 -07:00
LexManos
2e4a43e875 Updated Forge version to 5.0.0, for 1.4 2012-10-21 10:27:07 -07:00
LexManos
158c2f1feb Updated World patch, there are a lot of new things happening int he constructor, xcomp should probably vet this. 2012-10-21 10:26:07 -07:00
LexManos
07a4a9f41f Teleporting has a new function (func_82448_a), made it so that you can supply your own teleporter to that function, and so it works with dimension movement factors. 2012-10-21 10:25:27 -07:00
LexManos
a705a12cdf Removed Forge's TileEntity.getRenderDistance, now a vanilla feature: TileEntity.func_82115_m 2012-10-21 10:23:46 -07:00
LexManos
3f03cc8c87 BlockCrops is now the parent class of multiple types of crops, Wheat, Potatoes, and Carrots, updated getBlockDropped patch to reflect. 2012-10-21 10:22:56 -07:00
LexManos
067458bdc0 Patches removing forge spawn protection, now a vanilla feature. 2012-10-21 10:21:39 -07:00
LexManos
1ee857e779 Entities have a new function to determine explosion strength that they create, and implemented Item frame pickblock. 2012-10-21 10:20:39 -07:00
LexManos
6ffaa94994 BlockSnow now pretty much just passes harvestBlock to it's super. 2012-10-21 10:19:54 -07:00
LexManos
c81f696cd7 Updated Render patches, Bipeds now have the ability to have helmets, of either blocks, or the new 'heads' 2012-10-21 10:19:17 -07:00
LexManos
fd1f09a34e Patches that applied with little to no functional changes. 2012-10-21 10:16:55 -07:00
LexManos
01722c6c3c Forge spawn protection removed, now a vanilla feature. 2012-10-21 10:05:50 -07:00
LexManos
9eeda7b4db No longer needed, getRenderDistance removed because Vanilla has it now, TileEntity.func_82115_m 2012-10-21 10:05:02 -07:00
LexManos
305a1ef66b Moved to common where it should be 2012-10-21 10:02:23 -07:00
LexManos
6127c113b8 Remove final from 'villageCollectionObj' to allow for delayed setup of Map source objects. 2012-10-21 10:00:43 -07:00
LexManos
4a4166fe7e Update for new names in 1.4 2012-10-21 10:00:02 -07:00
Christian
b88f2e6938 Fix RenderRegistry render ID - now at 36
Fix SpriteMaps - they're running out fast! Switch to forge if you can!
RenderBiped now has an armorlist- so armortypes add to it as well
2012-10-21 12:41:53 -04:00
LexManos
bf14aefd28 Update Forge's AT for 1.4 names. 2012-10-21 05:46:23 -07:00
LexManos
ae28513c98 Fix recompile call for 1.4 MCP change 2012-10-21 05:46:10 -07:00
LexManos
ad1d1da435 FML Update for 1.4 2012-10-21 05:45:53 -07:00
Christian
8af47f2bb9 Fix up FML python script for forge 2012-10-21 08:19:36 -04:00
Christian
bdb8a7c059 Update to MCP pre 3. Fixes some weirdnesses with explosions. 2012-10-21 07:11:09 -04:00
Christian
76be826ffb Merge branch '1.4' 2012-10-20 18:07:22 -04:00
Christian
2fcea16485 Update for MCP release 2012-10-20 18:02:26 -04:00
Christian
698f0e69eb Remove fuzz from patches for INetworkManager change 2012-10-20 17:16:50 -04:00
Christian
8ce9b05d8b Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use... 2012-10-20 17:07:59 -04:00
Christian
c7002207fb Add a script to ignore git complaining about the eclipse workspace changing - run when you first open the eclipse workspace 2012-10-20 15:24:05 -04:00
Christian
fabc324487 Update gitignore - ignore the files that will change or be deleted 2012-10-20 15:14:06 -04:00
Christian
1a3c19430c Add in "starter" image for eclipse workspace 2012-10-20 15:02:37 -04:00
Christian
6c48db441c Eclipse workspace fixup 2? 2012-10-20 14:42:25 -04:00
Christian
75fa0f2bdb Clean up eclipse workspace- part 1 2012-10-20 14:09:44 -04:00
Christian
279b5d5e23 Clean up a bit of patch fuzz 2012-10-20 12:39:40 -04:00
Christian
7da5727e3e Fix CommonHandler for rename of the server thread class 2012-10-20 12:31:35 -04:00
Christian
59738c493a Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it. 2012-10-20 12:27:30 -04:00
Christian
70c342908f Fix exception for CodecMus 2012-10-20 12:12:43 -04:00
Christian
7ac53b4772 Fix some compilation issues. Requires resolving the worldclient abstract method 2012-10-20 11:30:01 -04:00