d3ab6d36a4
Merge pull request #1882 from t1g3l/master
...
Changed forge command tab completion to use getListOfStringsMatchingL…
2015-05-18 10:08:46 -07:00
6a299a483a
Changed forge command tab completion to use getListOfStringsMatchingLastWord()
2015-05-18 13:51:05 +02:00
8944983d0f
Merge pull request #1878 from t1g3l/master
...
Added tab completion to /forge command.
2015-05-17 14:55:39 -07:00
fe327fbd76
Added tab completion
2015-05-17 11:00:42 +02:00
58fdfb6fa1
Fix patches after last fml merge.
2015-05-14 13:56:10 -04:00
cb6f92e3c7
Merged FML
2015-05-11 18:46:21 -04:00
081a949bfd
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
2015-05-10 23:55:11 -04:00
1f679be553
Merge pull request #1863 from Tmtravlr/master
...
Initialized the Nether Fortress chest loot
2015-05-10 16:04:07 -07:00
b2de64bc70
Initialized the Nether Fortress chest loot
...
Forced the nether fortress chest loot to initialize in ChestGenHooks
like the other types.
Changed tabs to spaces. Silly Eclipse.
2015-05-10 15:59:07 -07:00
228ce68639
Update current json
2015-05-08 13:54:11 -04:00
76c7177553
Expose the state of the loader
2015-05-07 14:17:45 -04:00
7ab952d410
Merge pull request #1853 from Silfadur/master
...
Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI f...
2015-05-05 04:22:01 +03:00
b756bd5f9a
Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI for ItemCameraTransforms.TransformType.GUI
2015-05-05 02:23:38 +02:00
c28794fe38
Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed
2015-05-04 22:10:36 +03:00
fb18c07722
Eliminated texture name allocation race condition
2015-05-04 21:54:33 +03:00
65ab79cf69
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 8ccfa24764a3f4854f5334c0da1224286175e13b, reversing
changes made to 7c10b93a2ded2799d41b73b67a2766c31e992d8a.
2015-05-04 08:50:08 -04:00
c43e4a8022
Fix the ordering of the messages, so they make sense now.
2015-05-02 22:13:41 -04:00
a003d1b360
Merge pull request #1843 from Zaggy1024/getlightvaluefix
...
Make World.setBlockState check whether the light value from getLightValue(IBlockAccess, BlockPos) has changed.
2015-05-01 17:58:30 -07:00
ee003ef77e
Fixed a bug which caused the light level not to update when a block implements Block.getLightValue(IBlockAccess, BlockPos) to change the light value for different block states.
2015-05-01 17:10:08 -05:00
4e8d5255ed
Merge pull request #652 from AbrarSyed/patch-2
...
remapped parameters and added ending newlines
2015-04-29 14:45:59 -07:00
8e14f9e1cc
remapped parameters and added ending newlines
2015-04-29 13:37:09 -05:00
858c64ffd3
Optifine can tell us when they're ready for the new splash screen.
2015-04-29 08:15:35 -04:00
fd8c2ba08c
Merge pull request #650 from luacs1998/1.7.10
...
Add classloader exclusion for ASM
2015-04-27 15:30:09 -07:00
1aacf9cfe2
Merge pull request #649 from luacs1998/master
...
Add classloader exclusion for ASM
2015-04-27 15:29:34 -07:00
ddc6b0a19f
Synchronize the available libraries. Turns out we've been forcing a newer 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
2015-04-26 11:32:28 -04:00
0c933be8dd
Add classloader exclusion for ASM
2015-04-26 20:40:22 +08:00
aad4678d40
Add classloader exclusion for ASM
2015-04-26 20:14:35 +08:00
c6525cb3f3
Merge pull request #1832 from Parker8283/lhsf-1.8
...
[1.8] Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 17:21:30 -07:00
083e4758a4
Merge pull request #1831 from Zaggy1024/clientonlyrenderinlayer
...
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 17:00:37 -07:00
9a7c20e791
Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 19:58:24 -04:00
2589a0d1f6
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 18:45:49 -05:00
626a192ce6
Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack
2015-04-26 00:22:43 +03:00
46c5505565
Splash progress screen will not load in the presence of optifine anymore.
2015-04-25 15:05:28 -04:00
89daceb9eb
Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json
...
Example here: https://gist.github.com/cpw/d3edc292631708f2d454
2015-04-25 01:30:17 -04:00
4e6aa905f0
Fix trying to close the screen during error.
2015-04-25 00:41:50 -04:00
794ff1d1b4
Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now.
2015-04-25 05:12:02 +03:00
1fdd18398e
Fix broken log message in vanilla.
2015-04-24 19:02:54 -04:00
454e2e36a4
Track mipmaps and texture upload
2015-04-24 19:01:49 -04:00
753115678a
fixed bar text positioning
2015-04-25 01:37:39 +03:00
c8acd763ef
Thread errors should be correctly displayed in the crash report now
2015-04-25 01:27:57 +03:00
3d03b31d00
More progress bar hooks
2015-04-24 17:47:39 -04:00
d18d493174
More progress bar action!
2015-04-24 17:11:49 -04:00
ab3413a31e
Add in resource reloading to the bar. Tidy up some of the labels a bit.
2015-04-24 16:00:22 -04:00
591971936d
Cleanup RenderEntityItem patch, fixes Z-fighting issue in EntityItems. Closes #1824
2015-04-23 23:46:55 -07:00
53a21e7e47
Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:38:32 +03:00
68def9c352
Merge pull request #647 from AbrarSyed/patch-1
...
Fixed scala module libs in dev json
2015-04-23 18:55:27 -07:00
99c60ee156
fixed scala module libs in jsons
2015-04-23 20:54:14 -05:00
3f59b560d7
Merge pull request #1814 from Lunatrius/block-dispatcher
...
Extracted the creation of RegionRenderCache into a method for extendability
2015-04-22 13:25:48 -07:00
ea9d805e4f
Extracted the creation of RegionRenderCache into a method.
...
Classes extending RegionRenderCache can change the behavior of the cache, allowing to visually change blocks (schematics etc).
2015-04-22 15:40:07 +02:00
87e6c29028
Fix up multiple injections of cmdline files via versionspecificmoddir.
...
Closes #645
2015-04-22 08:31:25 -04:00
LexManos