LexManos
fd8c2ba08c
Merge pull request #650 from luacs1998/1.7.10
...
Add classloader exclusion for ASM
2015-04-27 15:30:09 -07:00
LexManos
1aacf9cfe2
Merge pull request #649 from luacs1998/master
...
Add classloader exclusion for ASM
2015-04-27 15:29:34 -07:00
cpw
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
luacs1998
0c933be8dd
Add classloader exclusion for ASM
2015-04-26 20:40:22 +08:00
luacs1998
aad4678d40
Add classloader exclusion for ASM
2015-04-26 20:14:35 +08:00
LexManos
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
LexManos
083e4758a4
Merge pull request #1831 from Zaggy1024/clientonlyrenderinlayer
...
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 17:00:37 -07:00
Parker Young
9a7c20e791
Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 19:58:24 -04:00
Zaggy1024
2589a0d1f6
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 18:45:49 -05:00
RainWarrior
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
cpw
37075d0437
MinecraftForge/FML@2ed00c4da0 Splash progress screen will not load in the presence of optifine anymore.
2015-04-25 15:06:20 -04:00
cpw
46c5505565
Splash progress screen will not load in the presence of optifine anymore.
2015-04-25 15:05:28 -04:00
cpw
63e71af229
MinecraftForge/FML@94821fac98 Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json
2015-04-25 01:34:25 -04:00
cpw
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
cpw
66a4db5fa0
MinecraftForge/FML@4fe7b469b5 Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now.
...
MinecraftForge/FML@31ae43590a Fix trying to close the screen during error.
2015-04-25 00:47:09 -04:00
cpw
4e6aa905f0
Fix trying to close the screen during error.
2015-04-25 00:41:50 -04:00
RainWarrior
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
cpw
55cbba0764
MinecraftForge/FML@36688e781a Add in resource reloading to the bar. Tidy up some of the labels a bit.
...
MinecraftForge/FML@a1dc465a55 More progress bar action!
MinecraftForge/FML@bfcbf4ef43 More progress bar hooks
MinecraftForge/FML@a6670c415e Thread errors should be correctly displayed in the crash report now
MinecraftForge/FML@9a16d26186 fixed bar text positioning
MinecraftForge/FML@0059c63028 Track mipmaps and texture upload
MinecraftForge/FML@ef5f809752 Fix broken log message in vanilla.
2015-04-24 19:16:55 -04:00
cpw
1fdd18398e
Fix broken log message in vanilla.
2015-04-24 19:02:54 -04:00
cpw
454e2e36a4
Track mipmaps and texture upload
2015-04-24 19:01:49 -04:00
RainWarrior
753115678a
fixed bar text positioning
2015-04-25 01:37:39 +03:00
RainWarrior
c8acd763ef
Thread errors should be correctly displayed in the crash report now
2015-04-25 01:27:57 +03:00
cpw
3d03b31d00
More progress bar hooks
2015-04-24 17:47:39 -04:00
cpw
d18d493174
More progress bar action!
2015-04-24 17:11:49 -04:00
cpw
ab3413a31e
Add in resource reloading to the bar. Tidy up some of the labels a bit.
2015-04-24 16:00:22 -04:00
Lex Manos
591971936d
Cleanup RenderEntityItem patch, fixes Z-fighting issue in EntityItems. Closes #1824
2015-04-23 23:46:55 -07:00
RainWarrior
a297a615b9
MinecraftForge/FML@5785a9c9e8 Fix up multiple injections of cmdline files via versionspecificmoddir. Closes #645
...
MinecraftForge/FML@bd117be9c3 Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:51:44 +03:00
RainWarrior
53a21e7e47
Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:38:32 +03:00
LexManos
68def9c352
Merge pull request #647 from AbrarSyed/patch-1
...
Fixed scala module libs in dev json
2015-04-23 18:55:27 -07:00
AbrarSyed
99c60ee156
fixed scala module libs in jsons
2015-04-23 20:54:14 -05:00
LexManos
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
Lunatrius
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
cpw
87e6c29028
Fix up multiple injections of cmdline files via versionspecificmoddir.
...
Closes #645
2015-04-22 08:31:25 -04:00
cpw
c12bb689fb
MinecraftForge/FML@a39482c4b7 Splash screen implementation
...
MinecraftForge/FML@01fea095cd Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10
MinecraftForge/FML@364b4bbbb0 Call some loader stuffs
MinecraftForge/FML@61a891280d Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:30:52 -04:00
cpw
ba354da317
Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:28:19 -04:00
cpw
6398961c48
Call some loader stuffs
2015-04-20 23:34:36 -04:00
cpw
8c54026f2d
Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10
2015-04-20 23:15:37 -04:00
RainWarrior
5b06b71d04
Splash screen implementation
2015-04-21 06:09:29 +03:00
cpw
50215307f2
MinecraftForge/FML@d14d1a8fea Update to use the inherited jar format. Simplifies a lot..
2015-04-20 22:27:10 -04:00
cpw
b049b39760
Update to use the inherited jar format. Simplifies a lot..
2015-04-20 22:25:29 -04:00
cpw
96cbadb874
Expose the fluid that a block was constructed with, useful for 'non-default'
...
configuration of fluidblocks. Shouldn't be used outside of this purpose.
2015-04-20 10:29:04 -04:00
cpw
50608986fe
Replace the OLD fluid in the fluidID map, not the new one..
2015-04-20 10:01:36 -04:00
cpw
7bbe8df2b8
Fix static initializer derp.
2015-04-20 09:26:27 -04:00
cpw
0543828603
Make FluidStack hold a delegate for the fluid. This can then float based on what is "live" at present.
2015-04-20 09:06:23 -04:00
cpw
7e9d2fb509
Reformat ItemArmor$ArmorMaterial.getBaseItem to use an if/then/else structure. The switch
...
causes the generation of an internal class which may derp custom armor addition.
Closes #1799
2015-04-19 12:04:22 -04:00
cpw
dcb2f2588c
Actually use the override constraint in ticket requests. Closes #1802
2015-04-19 11:57:39 -04:00
cpw
178acfbb20
Change logging to avoid the String.format bug. Closes #1809
2015-04-19 11:52:23 -04:00
cpw
57408af2a3
MinecraftForge/FML@8f9e3a7e30 Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638
2015-04-18 21:54:01 -04:00
cpw
e1ed3c07c2
Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638
2015-04-18 21:48:49 -04:00
cpw
54af750717
Verify that the fluid registry doesn't contain "junk" fluids thru reflection.
2015-04-18 21:37:45 -04:00
