Commit graph

4252 commits

Author SHA1 Message Date
Christian
0443ef5a9e MachineMuse, remember, there's TWO model formats supported! 2013-09-05 09:14:10 -04:00
Christian
e962c2a94d Merge branch 'master' of github.com:jk-5/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
2013-09-05 08:39:15 -04:00
Christian
8c2e171a16 Merge branch 'master' of github.com:mhahn1976/MinecraftForge into sometweaks 2013-09-05 08:26:11 -04:00
Christian
4fb8eb96d0 Merge branch 'french' of github.com:robin4002/MinecraftForge into sometweaks 2013-09-05 08:23:29 -04:00
Christian
7549eb90a7 Add a bit of javadoc 2013-09-05 08:22:28 -04:00
Christian
df132a0296 Merge branch 'displayname' of github.com:MachineMuse/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
2013-09-05 08:20:49 -04:00
Christian
e499a6d375 Merge branch 'objTessellation' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:58:56 -04:00
Christian
fe5f5e690e Fix patch for new MCP naming. 2013-09-05 07:57:21 -04:00
Christian
21cd975ae3 Merge branch 'mouseevent2' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:47:52 -04:00
Christian
32073a5bc1 Reduce patch size significantly 2013-09-05 07:45:29 -04:00
iChun
6cf8408752 Fix player push out of blocks clientside being hardcoded and not based on entity size.
Added player eyeHeight field to allow changeable eye heights of players rather than being hardcoded per player class as well as add a getDefaultEyeHeight function.
2013-09-05 14:57:34 +08:00
MachineMuse
7a77b61ddd fixed logic error 2013-09-04 15:27:45 -06:00
MachineMuse
ad09526bee inserted hook into Minecraft.java 2013-09-04 15:05:29 -06:00
MachineMuse
e3e3ea54f9 Added mouse event 2013-09-04 15:01:37 -06:00
MachineMuse
cb9c26d49c Memoization of display name result 2013-09-04 14:22:22 -06:00
Christian
cf88896ad7 Update version to 9.10.1 for mcp naming changes. 2013-09-03 18:09:07 -04:00
Christian
0d44234239 Update forge for MCP naming updates
Updated FML:
MinecraftForge/FML@d0c6e92900 Update MCP data
2013-09-03 18:04:12 -04:00
Christian
9387bae26b Update MCP data 2013-09-03 17:56:09 -04:00
MachineMuse
96c045137d Merge remote-tracking branch 'forge/master' into objTessellation 2013-09-03 15:45:45 -06:00
MachineMuse
0e3037e85d Added display name hook 2013-09-03 14:55:11 -06:00
Christian
5c334d7627 Fix possible NPE in searching code. 2013-09-02 15:44:27 -04:00
Christian
7246914605 Updated FML:
MinecraftForge/FML@2a9c485edc Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server.
2013-09-02 12:24:57 -04:00
Christian
b41a7e1dab Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server. 2013-09-02 12:24:17 -04:00
Christian
d9b72a2282 Updated FML:
MinecraftForge/FML@a13598b17e Use java 1.6 compatible method of closing the zip file. Stops stupid compile error.
2013-09-02 00:13:23 -04:00
Christian
b9ac2ac13c Use java 1.6 compatible method of closing the zip file. Stops stupid compile error. 2013-09-02 00:12:36 -04:00
Christian
4eb05ed571 Small fix to container registry. emptyContainer is not null, it's "NULL_EMPTYCONTAINER" now and won't match any valid container. 2013-08-28 22:16:59 -04:00
Christian
5a8def7d00 Tweak the release to add in assets to the distributable. *sigh* 2013-08-28 07:59:45 -04:00
robin
90be31ddc8 create french localization 2013-08-28 13:14:30 +02:00
Christian
dddb9b3189 Add some starting work for a forge tps command. Also update coremod for new FML behaviour 2013-08-27 23:07:30 -04:00
Christian
0c06d3b47a Updated FML:
MinecraftForge/FML@1c9a853868 Allow coremods to properly inject asset readers.
MinecraftForge/FML@40b54013b4 Allow server side lang file injection, hopefully
2013-08-27 23:04:48 -04:00
Christian
4f9b778d14 Allow server side lang file injection, hopefully 2013-08-27 22:45:10 -04:00
Christian
5925fa7c79 Allow coremods to properly inject asset readers. 2013-08-27 12:31:37 -04:00
Michael Hahn
cc96840aa8 capacity was not respected
Updated to properly calculate the amount of free space in the tank
before checking that against the amount of the resource.
2013-08-26 12:21:31 -05:00
jk-5
f78eba09fd Added GuiOpenEvent
You can use this for a clean way to override guis, without needing an
TickHandler to check if the gui you want to override is open and show
your own gui

Proper close check
2013-08-24 09:32:34 +02:00
Christian
ded1a92dfd Update tweaker for new Launcher API 2013-08-23 10:42:26 -04:00
Christian
b2c1eae652 Updated FML:
MinecraftForge/FML@b993cf4a98 More exception handling for less derpiness.
2013-08-20 21:01:02 -04:00
Christian
3b4f1983ce More exception handling for less derpiness. 2013-08-20 20:46:18 -04:00
Christian
8fed427251 In the time honoured tradition of trying to fix vanilla, we today attempt to patch the pathfinding AI so that it doesn't lag when
there's a lot of entities. Basically, if the zombie can't reach the villager, backoff subsequent pathfinding attempts. Hopefully
should really help with lag caused by zombie swarms.
2013-08-20 11:55:57 -04:00
Christian
b2d309b17e Allow multipass RenderItem rendering for terrain icons too. Should fix sengir's saplings. 2013-08-19 16:32:47 -04:00
Christian
8d6f893083 Updated FML:
MinecraftForge/FML@913f6f6d36 Try and use the relaunch log, which should be classloaded..
MinecraftForge/FML@ac065ff5f7 Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent and not dependent on mod ordering, or mod sideeffects.
2013-08-19 15:28:50 -04:00
Christian
94462565a5 Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent
and not dependent on mod ordering, or mod sideeffects.
2013-08-19 14:56:01 -04:00
Christian
6818c0f4da Try and use the relaunch log, which should be classloaded.. 2013-08-19 14:55:37 -04:00
LexManos
faba7e2a07 Skipp toss event for null entity items. Closes #732 2013-08-19 10:45:57 -07:00
LexManos
baf1e771e9 Cache world on all render passes in case some mod disables the first pass. 2013-08-19 10:45:29 -07:00
LexManos
461a30812b Fix bug with custom Fluids. You can now drown in them! 2013-08-18 23:16:36 -07:00
Christian
4b64c15ae8 Updated FML:
MinecraftForge/FML@9468e41bbf Fix up scala refs, for better results
2013-08-18 19:02:20 -04:00
Christian
4eb97daac3 Fix up scala refs, for better results 2013-08-18 18:58:36 -04:00
cpw
3625a409a5 Merge pull request #730 from Soaryn/patch-1
Adds Temperature to Lava
2013-08-17 11:17:34 -07:00
Christian
8533f974e8 Updated FML:
MinecraftForge/FML@ffdd056a18 Check keys, not values *sigh*
2013-08-17 13:28:06 -04:00
Christian
ed258920a0 Check keys, not values *sigh* 2013-08-17 13:27:43 -04:00