Commit Graph

  • 605457deec Merge pull request #2103 from olee/patch-1 LexManos 2015-09-27 14:41:29 -07:00
  • 90829a3164 Merge pull request #2120 from luacs1998/eventbus_fix LexManos 2015-09-27 02:12:50 -07:00
  • 05f6ede2ea Fix a possible crash in EventBus luacs1998 2015-09-27 12:47:37 +08:00
  • 1e7fbb7018 Merge pull request #2118 from rubensworks/itemmonsterplacer-dispenser LexManos 2015-09-22 12:18:26 -07:00
  • 385159c25e Fix dispenser action for modded spawn eggs Ruben Taelman 2015-09-22 19:53:34 +02:00
  • fb9ffa40fd Fix entity count being incorrect for spawning logic. Now filter out 'persistant' entities. Lex Manos 2015-09-14 13:18:34 -07:00
  • eacffb2b6e Update Gradle wrapper to 2.7 Lex Manos 2015-09-14 13:18:02 -07:00
  • fb7b47adb4 Merge pull request #2002 from ganymedes01/master LexManos 2015-09-09 11:23:08 -07:00
  • d70ca1a357 Workaround for MinecraftForge/ForgeGradle#256 RainWarrior 2015-09-02 22:01:30 +03:00
  • 31a3a18ec7 Disallow conflicting furnace recipes ganymedes01 2015-07-08 13:05:16 -03:00
  • 5074f26ccd FMLNetworkHandler.openGui should not try and open a GUI on a FakePlayer. Fixes #2082 and probably dozens of mod errors. Also, side benefit of the merged codebase! FML code can ref Forge code! cpw 2015-09-02 13:34:16 -04:00
  • 4315637f75 Merge branch 'laci200270-patch-1' cpw 2015-09-02 13:30:00 -04:00
  • b7e8dcff7b Format a bit better cpw 2015-09-02 13:29:43 -04:00
  • 5a9129f802 Merge branch 'patch-1' of https://github.com/laci200270/MinecraftForge into laci200270-patch-1 cpw 2015-09-02 13:27:42 -04:00
  • b175d265b9 Much requested temporary hack for items and TESRs. Context: #1582, #1597, #1713, #2058 and others. RainWarrior 2015-09-02 07:26:42 +03:00
  • e5ee9377fd Merge pull request #2086 from Vorquel/master LexManos 2015-09-01 16:32:26 -07:00
  • edcb45640f Merge pull request #2069 from simon816/profile-request-fix LexManos 2015-09-01 16:32:07 -07:00
  • d61a55b661 Use already provided profile for the player's own skin simon816 2015-08-08 21:59:44 +01:00
  • b312584ca4 Add Guava and Apache to LaunchClassLoader exclusion list on server simon816 2015-07-16 05:21:13 +01:00
  • ac5c7124de Fix possible crash in EventBus Björn Zeutzheim 2015-08-31 03:39:33 +09:00
  • 57d575f941 More cleanup of the default eclipse workspace. The project is now called "MDKExample" not "Minecraft". The project tree is now contemporary, instead of a copy from 1.5.x era MC. The launches are cleaned up, and refer to a better default "runDir" of "run" rather than "eclipse".. Updating to FG2.0.1 which will contain relevant binary fixes. cpw 2015-08-26 16:19:31 -04:00
  • d41e51f47b Fix eclipse workspace inside the mdk - don't run it through the tokenconverter. Also add in CREDITS-fml.txt to the MDK - it's still required. cpw 2015-08-26 13:57:51 -04:00
  • 90a88efd8a Fixed issue where config folder would not be created before SplashProgress tried to read from it. Default macs to disable the new loading screen due to to many macs having issues. Users can enable it again by editing their config. Catch and gracefully handle more errors when starting up the Splash Screen. Lex Manos 2015-08-22 18:55:32 -07:00
  • 4b299529b7 Update gradle wrapper and fix changelog task. Lex Manos 2015-08-22 17:57:12 -07:00
  • 589465bb81 Fix faulty Channel name James 2015-08-18 11:01:30 -07:00
  • 0d320e2e31 Fix crowdin again. Run, jenkins, for god's sake, run! cpw 2015-08-21 09:52:33 -07:00
  • 4903febd96 Fix crowdin task. Good luck jenkins, lets roll! cpw 2015-08-21 09:43:30 -07:00
  • bbe96a3577 Fix ciWriteBuildNumber task. Ugly, but it works. cpw 2015-08-20 13:42:58 -07:00
  • b211aca5ce Merge branch 'fg2' cpw 2015-08-20 12:27:20 -07:00
  • 58ab3de7c1 Remove patches cpw 2015-08-20 12:14:02 -07:00
  • ba8ae53867 Update FMLSecurityManager.java laci200270 2015-08-19 20:27:42 +02:00
  • 7e600c0dd8 Fix packaging the gradle wrapper properly. There is still a problem with the MDK- it fails to run setupDecompWorkspace. cpw 2015-08-15 10:16:00 -07:00
  • 9a0a00c7a4 Trying to fix the MDK to include gradle wrapper, but the gradle-wrapper.jar is corrupted. @AbrarSyed can you take a look? cpw 2015-08-15 09:56:56 -07:00
  • 91927e6bc7 The final nail in the coffin. BYE! cpw 2015-08-13 23:07:53 -07:00
  • fc045f210d Fix MDK task - it now runs. cpw 2015-08-13 23:07:17 -07:00
  • eecc691cdf Merge pull request #2072 from AbrarSyed/fg2 LexManos 2015-08-09 20:35:50 -07:00
  • 7a6557a9e2 added MDK package AbrarSyed 2015-08-09 20:30:31 -05:00
  • b45fd787f3 Merge pull request #1969 from diesieben07/blockhighlight LexManos 2015-08-05 11:48:53 -07:00
  • c2523c685a FML's metabolic processes are now history. FML's off the twig. FML's kicked the bucket, FML's shuffled off this mortal coil, run down the curtain and joined the bleedin' choir invisible!! THIS IS AN EX-PROJECT! cpw 2015-08-02 00:20:19 -04:00
  • dfd62a3bd8 Vestigal fml-ectomy. cpw 2015-08-02 00:03:47 -04:00
  • 614bbcb0da FML is no more. FML has ceased to be. FML's expired and gone to meet its maker. FML's a stiff! Bereft of life, FML rests in peace. cpw 2015-08-01 22:59:30 -04:00
  • 9a859f8d5c Merge branch 'master' of https://github.com/AbrarSyed/MinecraftForge into fg2 cpw 2015-08-01 20:55:58 -04:00
  • 5045d8df68 Merge branch '1.7.10' cpw 2015-08-01 20:30:22 -04:00
  • 9908310384 fixed deployment credentials AbrarSyed 2015-08-01 14:08:04 -05:00
  • 7b18eab02d Fix placing skulls on fence posts. Closes #2055 Lex Manos 2015-07-31 15:10:47 -07:00
  • bd4b3debc3 Merge pull request #1968 from modwizcode/master LexManos 2015-07-31 12:57:05 -07:00
  • 5623634f56 Merge pull request #2048 from shadekiller666/UnlistedPropertyValue LexManos 2015-07-25 15:12:57 -07:00
  • 87bbbfafcc Fixed a bug with ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty not allowing blocks to be placed. shadekiller666 2015-07-20 21:24:02 -07:00
  • 2a85ab0eab Merge pull request #2017 from liach/add-enum LexManos 2015-07-24 17:08:16 -07:00
  • 65123c66a0 Merge pull request #2004 from simon816/sign-nbt-fix LexManos 2015-07-24 13:53:27 -07:00
  • d72caa5005 Merge pull request #2047 from Zaggy1024/forgeblockstatesv1fixes LexManos 2015-07-24 11:28:23 -07:00
  • e580d3b6b6 Fixed a Forge blockstates json removing models causing an NPE in the loader. Fixed the deep clone of a V1 Variant not cloning the submodels properly. Zaggy1024 2015-07-24 13:20:10 -05:00
  • 5eea9cebae Merge pull request #1983 from clienthax/patch-1 LexManos 2015-07-23 12:13:00 -07:00
  • b8fe3913e9 Merge pull request #2044 from rubensworks/enumfacing-server LexManos 2015-07-23 10:58:17 -07:00
  • 04d4b2cf76 Make EnumFacing events available server-side Ruben Taelman 2015-07-23 16:51:45 +02:00
  • 81bb69b6c9 Merge pull request #2035 from rubensworks/master LexManos 2015-07-21 16:43:44 -07:00
  • 0cf1f0d51c Fix source block check for BlockFluidClassic Ruben Taelman 2015-07-21 10:51:53 +02:00
  • c308a47124 Cherry pick some changes from 1.8 for inner class discovery, also fix the negativecache. Closes #1872 cpw 2015-07-18 12:47:31 -04:00
  • cd313c195b Merge pull request #2023 from diesieben07/entity-pick LexManos 2015-07-16 11:33:01 -04:00
  • 9f571ff15d Allow the new entity eggs to be created via middle-click diesieben07 2015-07-16 14:13:48 +02:00
  • e2ee54a27d Add an EnumHelper hook and fixed an issue liach 2015-07-13 18:15:24 +08:00
  • 0f456b4684 Be a little bit more helpful when the ObjectHolder misses. Should help figure out what is going in in #2006 cpw 2015-07-09 17:05:20 -04:00
  • 8636eb1883 Wake up the FluidRegistry before any mods start loading. Should stop mods claiming to own water or lava (depending on who accessed FluidRegistry first) cpw 2015-07-09 16:53:31 -04:00
  • 50677ad87a Actually rebuild the fluidNames each rebuild, don't just try and force changes in. Should fix #1973 cpw 2015-07-09 16:40:51 -04:00
  • 81eb6a8bb4 Fix placing signs with NBT prompting for text simon816 2015-07-08 22:27:17 +01:00
  • 97f8c246b8 Signed-off-by: Clienthax <[email protected]> Clienthax 2015-06-30 22:29:34 +01:00
  • 20bf76464a Merge pull request #1978 from RainWarrior/model-rotation Fry 2015-06-30 22:14:31 +03:00
  • c4f370a7e6 Custom transformations in forge blockstate json. RainWarrior 2015-06-23 01:03:16 +03:00
  • 9ebc77ef22 updated installed gradle. not finished AbrarSyed 2015-06-30 00:14:41 -05:00
  • 2fce67c8b7 fixed local-building fail with changelog AbrarSyed 2015-06-29 13:29:14 -05:00
  • a55536c0dc added jenkins compat tasks AbrarSyed 2015-06-29 12:56:23 -05:00
  • 1ae0498534 Added FG2 buildscript + updated for Gradle 2.4 AbrarSyed 2015-06-28 17:19:52 -05:00
  • c02c379bed removed old unnecessary stuff AbrarSyed 2015-06-28 17:18:58 -05:00
  • c5ac5b0264 DeobfuscationData no longer required at dev time AbrarSyed 2015-06-28 17:16:10 -05:00
  • 0fb705f8f5 added hardcoded fml version file AbrarSyed 2015-06-28 17:12:10 -05:00
  • bbfae84ee8 removed broken and duplicate AT lines AbrarSyed 2015-06-28 17:11:14 -05:00
  • cab151ec44 Fixed ItemMonsterPlacer.getEggInfo missing return. Closes #1975 LexManos 2015-06-26 17:54:38 -07:00
  • 7a733d635e Merge pull request #1974 from Lunatrius/white-screen-fix LexManos 2015-06-26 16:16:01 -07:00
  • 44077774be Fixed error GUIs showing a white screen and replaced a rogue direct GL call. Lunatrius 2015-06-26 21:53:53 +02:00
  • 37b4936e9d Fix particle texture of the generated item models. Fry 2015-06-27 01:26:59 +03:00
  • 637e2c6f56 Merge pull request #1972 from bonii-xx/StateMapDomainFix LexManos 2015-06-26 04:03:25 -07:00
  • 2bfa1ffc05 Add debug for max texture size and output when Texture Atlas can not stitch all textures. Lex Manos 2015-06-26 03:32:09 -07:00
  • e55ee43fd5 Fix StateMap always mapping properties to the "minecraft" domain instead of the mods, causing it to not find BlockState definitions. Bernhard Bonigl 2015-06-26 10:29:10 +02:00
  • 204cb16bc4 ObjectHolder works great, but it should be a lot less spammy about failed lookups. They're usually mod options. cpw 2015-06-25 14:41:45 -04:00
  • ebef4553f3 Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update diesieben07 2015-06-25 19:07:27 +02:00
  • fe2c4c569d Fix harvest logic running in addition to shearable logic Starbuck Johnson 2015-06-24 14:28:47 -05:00
  • b2033d642c More descripotive error if Patcher is passed invalid data for vanilla classes. Lex Manos 2015-06-23 20:36:23 -07:00
  • 74501f509f There's no Map.getOrDefault in java6. RainWarrior 2015-06-23 17:03:19 +03:00
  • 8f65678b99 Vanilla models can now use custom textures. Fixes #1962 RainWarrior 2015-06-23 16:52:42 +03:00
  • 510b5523d5 Fixed perspective transformations for item models. RainWarrior 2015-06-23 15:55:58 +03:00
  • d7c4a06ce8 Fix AT for Block constructor. Lex Manos 2015-06-23 01:26:33 -07:00
  • 1582e401ed Added ItemLayerModel - less awkward, simpler and faster version of ItemModelGenerator. RainWarrior 2015-06-23 04:23:05 +03:00
  • bae83e6724 Merge remote-tracking branch 'origin/master' cpw 2015-06-21 22:08:08 -04:00
  • 16ff1be093 Merge branch '1.7.10' cpw 2015-06-21 21:59:51 -04:00
  • 8bb34107f1 Merge pull request #1858 from FlansMods/master LexManos 2015-06-21 11:19:26 -07:00
  • 2c24c7618a Mods that are extracted to the mods dir by unzipping or whatever will now cause the game to crash. Too much info is in the META-INF now, and more will be being added. Extracting to the mods dir just completely breaks that. cpw 2015-06-20 14:47:55 -04:00
  • 240ed53a88 Merge pull request #1956 from lawremi/mesadictfix LexManos 2015-06-19 11:25:49 -07:00
  • 2cb971c38f fix logic for guessing mesa tag in biome dict larman 2015-06-19 07:04:19 -07:00
  • 7041fbc27e Time each bar in the loading screen and print it to the log, useful information to see where most time is spent in loading. Lex Manos 2015-06-18 22:18:27 -07:00
  • e519278888 Add TextureManager to loading screen. Lex Manos 2015-06-18 22:17:21 -07:00