Commit Graph
4660 Commits
Author SHA1 Message Date
Christian Weeks 2f09a048d6 Tweaks to basemod setup 2012-06-01 00:33:51 -04:00
Christian Weeks 4085617ca2 Bukkitside fixup 2012-06-01 00:27:46 -04:00
Christian Weeks 51701d09fd Merge branch 'bukkitreorg' 2012-05-31 23:07:16 -04:00
Christian Weeks 72ad8bcde1 Merge branch 'bukkit'
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 23:00:06 -04:00
Christian Weeks cfb99b01c8 Fix copied code. Derpbag. 2012-05-31 22:48:44 -04:00
Christian Weeks e35d31e50d Update FML with recent mainline changes 2012-05-31 22:48:44 -04:00
Christian Weeks c4ad78ab87 Update bukkit with new mod fixes 2012-05-31 22:48:44 -04:00
Christian Weeks ac779739aa Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman 2012-05-31 22:48:44 -04:00
Christian Weeks 09d5bf95ae Fix chunk generators for bukkit 2012-05-31 22:48:44 -04:00
Christian Weeks b2e01d8f2a Bukkit version 2012-05-31 22:48:44 -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 ae6621bfdd More tweaks for proper API 2012-05-31 22:42:23 -04:00
Christian Weeks dfd15acb6d Reorganize for bukkit integration 2012-05-31 22:09:45 -04:00
Christian Weeks 660521e6f2 Fix project, new gui layout with screenshot, thanks Sengir! 2012-05-30 09:25:04 -04:00
LexManos d27c3d7006 Included fmlversion.properties in the release zips. 2012-05-27 06:16:19 -07:00
LexManos cbab8188c2 Added FML ReadMe, Credits, and License to release zips 2012-05-27 05:47:58 -07:00
LexManos b65c1f01ec Updated to FML Build 95 2012-05-27 05:08:22 -07:00
LexManos c708b83425 Updated patches for FML, moved some extranious code to Forge classes instead of patches. 2012-05-27 04:27:15 -07:00
LexManos ce2a9f270a Updated MCP Mapings and patches. 2012-05-27 04:26:38 -07:00
LexManos cbf70c165a Added FML mod info file 2012-05-27 04:23:23 -07:00
Christian Weeks b5a10c0153 Add in missing hooks, add branding information to the crash report 2012-05-27 07:14:35 -04:00
LexManos 888e036c7d Cleaned up names for Minecraft Forge's text files so they dont clash with other mods. Fixed up the release script to include the license text, and executable permissions for install.sh. 2012-05-27 02:27:42 -07:00
LexManos d952a7be49 Added new source clean step to fix linux vs windows astyle issues. 2012-05-27 01:52:02 -07:00
LexManos 2898457766 Update FML to 92, this include full client side support, ModLoader nolonger needed. 2012-05-27 01:51:38 -07:00
LexManos d4fd21dcbc Fixed regex issue in last push. 2012-05-27 01:40:22 -07:00
LexManos 379c5b2888 Fixed up for newline before case bodies. 2012-05-27 01:24:45 -07:00
LexManos 51a959f8a4 Should fix windows {me} generating different patches then linux {cpw} 2012-05-27 00:22:27 -07:00
LexManos eee81351d4 Bump version number for official release. 2012-05-26 20:28:24 -07:00
Christian Weeks 7d7c395ff3 Move first tick to the real first tick 2012-05-26 02:30:21 -04:00
Christian Weeks 7c590e62c6 Merge in the mod texture changes from Lex 2012-05-26 02:29:35 -04:00
LexManos 6191ed61e0 Fixed location refs to fmlversion.properties 2012-05-25 23:25:05 -07:00
Christian Weeks 96b442e3cc Add in a static render access class for optifine and other render editing mods to use 2012-05-25 22:13:51 -04:00
Christian Weeks 3454b43daa Add in a "world load" tick fired just as the world completes loading. This SHOULD fix millinaire. 2012-05-25 17:21:30 -04:00
Christian Weeks f3b15940ee Changing up the mod list data 2012-05-25 15:25:35 -04:00
LexManos 7667df0caf Fixed up ModTexture* classes to use the ITextureFX events to resize the image as needed. Also fixed ModTextureStatic's not being applied properly. 2012-05-24 22:48:15 -07:00
Christian Weeks d45134eb9a Fix up two stupid overwrites in my mergeup from lex 2012-05-24 23:18:04 -04:00
Christian Weeks fe710a9245 Fix derp in MTS 2012-05-24 22:13:33 -04:00
Christian Weeks 46b7dc0fec Patch fixing 2012-05-24 21:40:34 -04:00
Christian Weeks f5598573a2 Update some stuff for updated tweaks 2012-05-24 21:39:16 -04:00
Christian Weeks d7c9010c92 Update FMLClient with my changes 2012-05-24 21:33:43 -04:00
Christian Weeks 012c378427 my tweaks 2012-05-24 21:06:27 -04:00
LexManos 00ca4ead44 difflist should include server and client now. 2012-05-24 03:48:59 -07:00
LexManos 2927be6247 Some patch cleanup. 2012-05-24 02:18:20 -07:00
LexManos a9b317c941 Rewrote how HD Texture support worked, to make it easier for Optifine to integrate.
Fixed TextureFlamesFX for extramly large texture sizes.
Fixed the texture size sceme to allow for different sizes of textures in the same pack.
2012-05-24 01:35:37 -07:00
LexManos 1727ce69ed Line number changed.. 2012-05-24 01:33:50 -07:00
Christian Weeks 0d5ab57fa0 Fix up the watch 2012-05-18 20:42:12 -04:00
Christian Weeks 2dcd1c4065 And some tweaks to the texture handling 2012-05-18 20:17:07 -04:00
Christian Weeks a40ba43957 Fix up some fubars in MTS and MTA 2012-05-18 20:16:41 -04:00
Christian Weeks 88f3c4f9bd Lots of error handling. 2012-05-18 10:38:40 -04:00
Christian Weeks dd94427f22 Missed a patch *sigh* 2012-05-17 21:57:24 -04:00