Permalink
Commits on May 11, 2015
  1. @cpw

    Merge branch '1.7.10'

    Conflicts:
    	patches/minecraft/net/minecraft/client/Minecraft.java.patch
    	src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
    	src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
    	src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
    	src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
    	src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
    	src/main/java/net/minecraftforge/fml/common/LoadController.java
    	src/main/java/net/minecraftforge/fml/common/Loader.java
    	src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java
    	src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
    	src/main/resources/fml_at.cfg
    cpw committed May 11, 2015
Commits on May 8, 2015
  1. @cpw

    Update current json

    cpw committed May 8, 2015
Commits on May 7, 2015
  1. @cpw

    Expose the state of the loader

    cpw committed May 7, 2015
Commits on May 4, 2015
  1. @cpw

    Revert "Merge pull request #650 from luacs1998/1.7.10"

    This undoes the seriously broken change from Sponge to support Mixins, that breaks
    a wide variety of coremods. Given the widespread incompatibility it introduces, it
    won't be re-added at 1.7.10.
    
    This reverts commit 8ccfa24, reversing
    changes made to 7c10b93.
    cpw committed May 4, 2015
Commits on May 3, 2015
  1. @cpw
Commits on Apr 29, 2015
  1. @cpw
Commits on Apr 26, 2015
  1. @cpw

    Synchronize the available libraries. Turns out we've been forcing a n…

    …ewer apache commons-lang(3.2.1)
    
    for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping
    commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects
    Closes #651
    cpw committed Apr 26, 2015
Commits on Apr 25, 2015
  1. @cpw
  2. @cpw

    Add a config file that lets you add additional soft dependencies at r…

    …untime - injectedDependencies.json
    
    Example here: https://gist.github.com/cpw/d3edc292631708f2d454
    cpw committed Apr 25, 2015
  3. @cpw
Commits on Apr 24, 2015
  1. @cpw

    Fix broken log message in vanilla.

    cpw committed Apr 24, 2015
  2. @cpw

    Track mipmaps and texture upload

    cpw committed Apr 24, 2015
  3. @cpw

    More progress bar hooks

    cpw committed Apr 24, 2015
  4. @cpw

    More progress bar action!

    cpw committed Apr 24, 2015
  5. @cpw
Commits on Apr 22, 2015
  1. @cpw
Commits on Apr 21, 2015
  1. @cpw
  2. @cpw

    Call some loader stuffs

    cpw committed Apr 21, 2015
  3. @cpw
  4. @cpw
Commits on Apr 19, 2015
  1. @cpw

    Exceptions during construction phase should not propogate and cause a…

    …n immediate crash. Closes #638
    cpw committed Apr 19, 2015
Commits on Apr 11, 2015
  1. @cpw

    Some tidyup of the PR

    cpw committed Apr 11, 2015
  2. @cpw

    Some tidyup of the PR

    cpw committed Apr 11, 2015
  3. @cpw

    Enhance error output for bad textures a bit more and try and capture …

    …more types of error..
    cpw committed Apr 11, 2015
  4. @cpw

    Cleaning up the missing resource stack spam, and condensing the infor…

    …mation into a usefully understandable
    
    format.
    cpw committed Apr 11, 2015
  5. @cpw

    Clean up some dead code

    cpw committed Apr 11, 2015
Commits on Apr 2, 2015
  1. @cpw

    Fix json cache crash, handle the file much more cleanly. Probably an …

    …MC JIRA since
    
    it's a vanilla bug. Closes #619
    cpw committed Apr 2, 2015
Commits on Apr 1, 2015
  1. @cpw
  2. @cpw

    Pull in a lot of the FML tweaks from 1.7 to 1.8

    Merge remote-tracking branch 'origin/1.7.10'
    
    Conflicts:
    	src/main/java/cpw/mods/fml/common/MissingModsException.java
    cpw committed Apr 1, 2015
  3. @cpw
Commits on Mar 31, 2015
  1. @cpw

    You can't setAction to BLOCKONLY

    cpw committed Mar 31, 2015
  2. @cpw

    And fix itemblocks being removed, leaving behind a residual block. This

    is a legitimate action - use the missing mapping event to let the mod
    tell us about it
    cpw committed Mar 31, 2015
  3. @cpw
  4. @cpw

    Rather than try to fall back to the backup level.dat in case of weird…

    …ness
    
    in the ID map, just fail hard. There is probably a serious modder derp in this
    case and there's nothing FML can do to recover the situation except avoid
    making it worse.
    cpw committed Mar 31, 2015
  5. @cpw