Commit Graph

  • b1ca21a161 Some patches for the server Christian 2012-07-05 22:31:46 -04:00
  • 32e93213f1 Some patches for the server Christian 2012-07-05 22:31:46 -04:00
  • bc42a54a51 Lots of client patch fixup Christian 2012-07-05 18:13:47 -04:00
  • b9466b8ee5 Lots of client patch fixup Christian 2012-07-05 18:13:47 -04:00
  • 1555bd8c53 Update git ignore to ignore a fernflowerzip that's lying around Christian 2012-07-05 15:38:37 -04:00
  • 275b78957a Update git ignore to ignore a fernflowerzip that's lying around Christian 2012-07-05 15:38:37 -04:00
  • 649e3e7bc5 And we have a brand, "fml". We're definitely modded :) Christian 2012-07-05 15:36:31 -04:00
  • 4ab2a3cb6b And we have a brand, "fml". We're definitely modded :) Christian 2012-07-05 15:36:31 -04:00
  • ead4e5255e UnexpectedThrowable is now the much more awesome CrashReport! Christian 2012-07-05 15:35:38 -04:00
  • 58576c2a19 UnexpectedThrowable is now the much more awesome CrashReport! Christian 2012-07-05 15:35:38 -04:00
  • 5eafb71083 Merge branch 'master' into minecraft1.3 Bring some of the ticking fixes in Christian 2012-07-05 15:30:21 -04:00
  • c0b707a9bd Merge branch 'master' into minecraft1.3 Bring some of the ticking fixes in Christian 2012-07-05 15:30:21 -04:00
  • 8ed36f583d Got the relauncher downloading and injecting library files Christian 2012-07-05 15:23:37 -04:00
  • e8b09f4692 Got the relauncher downloading and injecting library files Christian 2012-07-05 15:23:37 -04:00
  • 1012531538 Merge pull request #98 from cpw/master LexManos 2012-07-03 22:10:52 -07:00
  • e934a57f6b Update fml to 175- fixes some weird ticking behaviours for ML mods, adds in new ticking behaviours for smart mods Christian 2012-07-04 00:29:15 -04:00
  • 3e311fd4c1 Tweak ticking YET AGAIN. Should fire a solitary GUILOAD tick right as the game screen loads. Hopefully fixes worldload tick issue too Christian 2012-07-04 00:16:30 -04:00
  • decbe8ba7c Tweak ticking YET AGAIN. Should fire a solitary GUILOAD tick right as the game screen loads. Hopefully fixes worldload tick issue too Christian 2012-07-04 00:16:30 -04:00
  • a4ce90a918 FFS let this fix that bloody ticking mess that is ML compatibility. Christian 2012-07-03 23:03:51 -04:00
  • 53c2b50212 FFS let this fix that bloody ticking mess that is ML compatibility. Christian 2012-07-03 23:03:51 -04:00
  • ba46389a87 Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb. Fix Worldload being filtered from the trigger arming. Also, improve errors going to an error screen. There should be more information now. Christian 2012-07-03 22:39:35 -04:00
  • 3d8a5edc30 Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb. Fix Worldload being filtered from the trigger arming. Also, improve errors going to an error screen. There should be more information now. Christian 2012-07-03 22:39:35 -04:00
  • f7e07ca7d8 Change gui ticking and world load tick. Should close issue #40 and kill it deader than a very very dead thing. *$^*(#% Modloader ticking b#%$hit Christian 2012-07-03 21:37:54 -04:00
  • 275fd394c1 Change gui ticking and world load tick. Should close issue #40 and kill it deader than a very very dead thing. *$^*(#% Modloader ticking b#%$hit Christian 2012-07-03 21:37:54 -04:00
  • 3e80a9ee7d Merge branch 'master' into minecraft1.3 Christian 2012-07-03 08:15:58 -04:00
  • d1f791f94e Merge branch 'master' into minecraft1.3 Christian 2012-07-03 08:15:58 -04:00
  • dfc6f7b1c1 Tweak build xml for more cleanliness Christian 2012-07-03 08:14:35 -04:00
  • 60b50bb7f2 Tweak build xml for more cleanliness Christian 2012-07-03 08:14:35 -04:00
  • 753f5f7bc8 Merge branch 'antscriptupdates' Christian 2012-07-02 23:50:49 -04:00
  • 9cafdf94ac Merge branch 'antscriptupdates' Christian 2012-07-02 23:50:49 -04:00
  • 982271e8ec Update some stuff Christian 2012-07-02 23:49:40 -04:00
  • 07a1927c25 Update some stuff Christian 2012-07-02 23:49:40 -04:00
  • 802ec3d86a Merge branch 'antscriptupdates' into minecraft1.3 Christian 2012-07-02 23:49:06 -04:00
  • 777b4407c2 Merge branch 'antscriptupdates' into minecraft1.3 Christian 2012-07-02 23:49:06 -04:00
  • f1b0e33694 Add in more options for ant script and clean up needing to clean every time. Christian 2012-07-02 23:43:29 -04:00
  • a98ffafd71 Add in more options for ant script and clean up needing to clean every time. Christian 2012-07-02 23:43:29 -04:00
  • a82498a083 Updated some remaining scripts to call there python versions. LexManos 2012-07-02 20:05:42 -07:00
  • b70f3820f0 Removed symlink files, shouldn't be in the repo. LexManos 2012-07-02 20:04:15 -07:00
  • eed01c4afc Moved licenses and credits into install folder. LexManos 2012-07-02 19:59:40 -07:00
  • 1d64fb01bd Merge branch 'testrecover' Christian 2012-07-02 20:19:23 -04:00
  • 414d59b1aa Merge branch 'testrecover' Christian 2012-07-02 20:19:23 -04:00
  • 086f575a41 Merge branch 'antscriptupdates' into minecraft1.3 Christian 2012-07-02 15:56:33 -04:00
  • f0aa28162e Merge branch 'antscriptupdates' into minecraft1.3 Christian 2012-07-02 15:56:33 -04:00
  • 3cda115cd5 Merge branch 'antscriptupdates' Christian 2012-07-02 15:55:24 -04:00
  • f0484a8941 Merge branch 'antscriptupdates' Christian 2012-07-02 15:55:24 -04:00
  • d491502750 Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of setup and added an updatepatches call too Christian 2012-07-02 15:54:25 -04:00
  • 2090264599 Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of setup and added an updatepatches call too Christian 2012-07-02 15:54:25 -04:00
  • 1d4c33d161 Merge branch 'antscriptupdates' into minecraft1.3 Christian 2012-07-02 15:21:15 -04:00
  • ecaa158981 Merge branch 'antscriptupdates' into minecraft1.3 Christian 2012-07-02 15:21:15 -04:00
  • 47a879a961 Merge branch 'antscriptupdates' Christian 2012-07-02 15:17:32 -04:00
  • 33517d2b8d Merge branch 'antscriptupdates' Christian 2012-07-02 15:17:32 -04:00
  • b59184424b Add in a setupenvironment ant target specifically for setting up an FML environment from scratch Christian 2012-07-02 15:16:40 -04:00
  • 6c99b80b73 Add in a setupenvironment ant target specifically for setting up an FML environment from scratch Christian 2012-07-02 15:16:40 -04:00
  • a7803d1785 Harvest MC version from MCP Christian 2012-07-02 12:24:37 -04:00
  • 0418f01886 Harvest MC version from MCP Christian 2012-07-02 12:24:37 -04:00
  • 5415bf87ce fix sided proxy bukkit test (not used so not a biggie) Christian 2012-07-02 12:32:41 -04:00
  • 6f8409a2ce fix sided proxy bukkit test (not used so not a biggie) Christian 2012-07-02 12:32:41 -04:00
  • a33f2dde77 Harvest MC version from MCP Christian 2012-07-02 12:24:37 -04:00
  • a8f599983e Harvest MC version from MCP Christian 2012-07-02 12:24:37 -04:00
  • 9e6c49d9d9 Fix furnaces not smelting the proper number of results after the first one. Damn you tahg, fix this! Keeps falling through my cracks. LexManos 2012-07-01 06:52:38 -07:00
  • bb7ef791de Initial checkin. Some patches are probably missing, but client compiles. Christian 2012-06-29 20:18:04 -04:00
  • b51ce21b70 Initial checkin. Some patches are probably missing, but client compiles. Christian 2012-06-29 20:18:04 -04:00
  • 74d5cdcb9d Merge pull request #94 from cpw/hastileentitybugfix LexManos 2012-06-29 14:02:34 -07:00
  • 9100172867 Fix server check "blockHasTileEntity" used to determine if getDescriptionPacket is sent for the block to be metadata sensitive. Thanks iChun! Christian 2012-06-29 09:47:10 -04:00
  • aa1a5d3c19 Working simple scheduled ticking, Player ticks v2.9 Christian 2012-06-28 23:37:30 -04:00
  • 731dbf5175 Working simple scheduled ticking, Player ticks Christian 2012-06-28 23:37:30 -04:00
  • a53d8c926e Support tick spacing through new IScheduledTickHandler Christian 2012-06-28 17:10:35 -04:00
  • d3b48f0c21 Support tick spacing through new IScheduledTickHandler Christian 2012-06-28 17:10:35 -04:00
  • dd5d3256d4 Merge pull request #93 from cpw/fixghost4096 LexManos 2012-06-28 12:45:01 -07:00
  • 714cd8d8df Change TickType.WORLD to send the world as arg[0] to match the server. Christian 2012-06-28 14:24:34 -04:00
  • ce9be2864c Change TickType.WORLD to send the world as arg[0] to match the server. Christian 2012-06-28 14:24:34 -04:00
  • 59a783e8b9 Fix ghost players who appear if they don't have the 4096 fix installed Christian 2012-06-28 13:44:07 -04:00
  • c9f7444d06 And there are not 1000 seconds in a second Christian 2012-06-28 08:31:32 -04:00
  • 541951416e And there are not 1000 seconds in a second Christian 2012-06-28 08:31:32 -04:00
  • ea05777032 Seconds are 1000 milliseconds long. Not 1 millisecond long. Christian 2012-06-28 08:27:21 -04:00
  • 4f8d71e289 Seconds are 1000 milliseconds long. Not 1 millisecond long. Christian 2012-06-28 08:27:21 -04:00
  • 14fea4a3a3 Tweak profiler command on bukkit Christian 2012-06-28 08:21:24 -04:00
  • 7098d613a0 Tweak profiler command on bukkit Christian 2012-06-28 08:21:24 -04:00
  • 0613858855 Fix up a derp in the timing command Christian 2012-06-27 22:13:55 -04:00
  • e688e04446 Fix up a derp in the timing command Christian 2012-06-27 22:13:55 -04:00
  • 7f832b4504 Fix container creative to not add Blocks above 256 unless it's told to. LexManos 2012-06-27 17:20:25 -07:00
  • 0e6e8b87aa Merge pull request #91 from cpw/multiversefix LexManos 2012-06-27 14:37:01 -07:00
  • 43e4ed7872 Fix world provider behaviour: WorldProvider.byDimension should always return a new instance- otherwise you can end up with worlds overwriting one another Christian 2012-06-27 17:21:41 -04:00
  • 6687ed360b Fix code to use guava 10 only. Stupid bukkit plugins and daft dependencies on guava 10! Christian 2012-06-27 08:23:53 -04:00
  • 0878bd1fcf Fix code to use guava 10 only. Stupid bukkit plugins and daft dependencies on guava 10! Christian 2012-06-27 08:23:53 -04:00
  • 409506d2b2 Tweak for end profiling Christian 2012-06-26 23:37:54 -04:00
  • 1c7bcf8077 Tweak for end profiling Christian 2012-06-26 23:37:54 -04:00
  • b96d6e00c3 Add in simple profiler for bukkit Christian 2012-06-26 23:16:23 -04:00
  • 81d4d77202 Add in simple profiler for bukkit Christian 2012-06-26 23:16:23 -04:00
  • b6ae926fd3 Add in a mechanism to get the modcontainer for a mod - so things can be programmatically changed Christian 2012-06-26 16:24:50 -04:00
  • 5a5ff97f39 Add in a mechanism to get the modcontainer for a mod - so things can be programmatically changed Christian 2012-06-26 16:24:50 -04:00
  • 508c986166 Add in bukkit support for recipe change Christian 2012-06-26 15:40:30 -04:00
  • a7caad10ba Add in bukkit support for recipe change Christian 2012-06-26 15:40:30 -04:00
  • 725201040e Add in a new recipe handler registry method for ease of adding recipes to MC Christian 2012-06-26 15:29:34 -04:00
  • 64dab3c8d7 Add in a new recipe handler registry method for ease of adding recipes to MC Christian 2012-06-26 15:29:34 -04:00
  • f174cb3948 Merge remote-tracking branch 'origin/master' LexManos 2012-06-26 12:10:57 -07:00
  • 9efdca3aab Fixed isBlockReplaceable and placing ItemBlocks' LexManos 2012-06-26 12:10:42 -07:00
  • 84613d5a92 Fucking spelling nazis LexManos 2012-06-24 14:48:09 -07:00
  • 61e8b92a78 Updated FML to build 153 LexManos 2012-06-22 18:49:30 -07:00
  • 62078cdd46 Fix bitmask bug related to 4096 in multi-block change. LexManos 2012-06-22 18:49:05 -07:00