Commit graph

25 commits

Author SHA1 Message Date
Christian
7098d613a0 Tweak profiler command on bukkit 2012-06-28 08:21:24 -04:00
Christian
e688e04446 Fix up a derp in the timing command 2012-06-27 22:13:55 -04:00
Christian
0878bd1fcf Fix code to use guava 10 only. Stupid bukkit plugins and daft dependencies on guava 10! 2012-06-27 08:23:53 -04:00
Christian
1c7bcf8077 Tweak for end profiling 2012-06-26 23:37:54 -04:00
Christian
81d4d77202 Add in simple profiler for bukkit 2012-06-26 23:16:23 -04:00
Christian
a7caad10ba Add in bukkit support for recipe change 2012-06-26 15:40:30 -04:00
Christian
58d6e58b93 Update bukkit with changes 2012-06-20 12:36:48 -04:00
Christian
b8ae8664ac Fix up bukkit for biome code 2012-06-09 10:47:43 -04:00
Christian
16ab855df5 Update bukkit for world gen tweaks 2012-06-07 19:47:11 -04:00
Christian
749cb7bcd6 Update bukkit for early load change 2012-06-07 19:28:07 -04:00
Christian
33fc5228ce Update bukkit handler 2012-06-07 17:57:07 -04:00
Christian Weeks
0814f177c5 Update bukkit handlers 2012-06-07 14:03:42 -04:00
Christian Weeks
eae26b0562 Helps to have a retention policy 2012-06-02 22:41:50 -04:00
Christian Weeks
38978a35dc Add in bukkit proxy handler 2012-06-02 22:14:25 -04:00
Christian Weeks
446faad048 Update bukkit handler to inject names at startup 2012-06-02 11:03:20 -04:00
Christian Weeks
0e6ccd81ed Update bukkit handler 2012-06-01 23:10:38 -04:00
Christian Weeks
7d07a752d8 Fix ticking on bukkit server 2012-06-01 11:08:32 -04:00
Christian Weeks
4085617ca2 Bukkitside fixup 2012-06-01 00:27:46 -04:00
Christian Weeks
2521e5b390 Merge branch 'bukkit' - massive code reorganization for fml 2.0
Conflicts:
	common/cpw/mods/fml/common/IWorldGenerator.java
	common/cpw/mods/fml/common/registry/FMLRegistry.java
	common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
	common/net/minecraft/server/CommonRegistry.java
	common/net/minecraft/server/IMinecraftRegistry.java
	common/net/minecraft/src/CommonRegistry.java
	common/net/minecraft/src/IMinecraftRegistry.java
2012-05-31 22:45:19 -04:00
Christian Weeks
6ae8a2d5b9 Fix copied code. Derpbag. 2012-04-28 16:47:04 -04:00
Christian Weeks
f1168856bd Update FML with recent mainline changes 2012-04-28 16:40:25 -04:00
Christian Weeks
e510cca030 Update bukkit with new mod fixes 2012-04-18 14:06:54 -04:00
Christian Weeks
b2b4551df8 Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman 2012-04-16 01:00:06 -04:00
Christian Weeks
8800abf06c Fix chunk generators for bukkit 2012-04-15 22:42:06 -04:00
Christian Weeks
a08eefa261 Bukkit version 2012-04-14 23:01:03 -04:00