Commit graph

2294 commits

Author SHA1 Message Date
bspkrs
e35755c3e3 Fixed missing assignment of constructor arg (thanks @Lunatrius)
I must have edited this out when I was cleaning up my formatting commit spam.
2014-07-15 09:47:01 -04:00
LexManos
e2fe13bd17 Merge pull request #1226 from williewillus/xporb
Fix experience orbs spawning at 32x coordinates clientside
2014-07-14 14:56:52 -07:00
Vincent Lee
a35457ecb7 Fix comment derp (+1 squashed commits)
Squashed commits:

[52c40bc] Fix experience orbs spawning at 32x coordinates clientside

Add // FORGE comment

Add // FORGE comment to clarify the purpose of the change
2014-07-14 16:43:16 -05:00
LexManos
79cda09594 Merge pull request #1225 from williewillus/master
Fix chat opacity
2014-07-14 13:11:09 -07:00
Vincent Lee
5c0217d316 Fix chat opacity
Add // FORGE comment

As per convention, add // FORGE comment to clarify the purpose of the change
2014-07-13 23:44:47 -05:00
Lex Manos
52ec4f7c57 Updated FML:
MinecraftForge/FML@ab52901b8b Force preferIPv4Stack to true early in the load chain to combat netty loopback issues.
MinecraftForge/FML@11893fbbb7 Add system property to skip doing world backups when game registry changes. This is SEVERLY ill-advised, if you do this DO NOT ask for any support.
MinecraftForge/FML@fdb6b34b8f Update authlib and realms to latest json data.
MinecraftForge/FML@b3a74882b4 added slider controls for numerics. default control is textbox, but slider can be used as a custom list entry class. fixed constructor javadocs in GuiConfig
MinecraftForge/FML@7c6d1f7568 Merge pull request #468 from bspkrs/master
MinecraftForge/FML@692d955c1a Update tweaker login to use authlib.
MinecraftForge/FML@c2119eb1c1 Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working.
2014-07-11 18:17:50 -07:00
Glassmaker
ff2696dff8 Adds getLocalizedName and getUnlocalizedName to FluidStack 2014-07-10 15:25:53 +03:00
cpw
27d5dc0a25 Add a system property for the stencil, in case config is not available.. 2014-07-09 10:59:33 -04:00
LexManos
01d0e6a481 Merge pull request #1213 from TheCountryGamer/master
RenderBlockOverlayEvent patch
2014-07-08 13:17:30 -07:00
TheCountryGamer
7adaef9aed RenderBlockOverlayEvent patch
Fixes skewed XYZ parameters
2014-07-08 15:49:32 -04:00
Lex Manos
195542c5fb Fixed Enchantment.addToBookList Closes #1160 2014-07-07 21:54:32 -07:00
Lex Manos
af9229d3bc Add ability for modders to designate custom biome types. And remove note about automatically registering. Closes #1167 2014-07-07 21:29:37 -07:00
LexManos
ba6c2c88ed Merge pull request #1194 from diesieben07/potion-icon
Added hook for potion inventory icons
2014-07-07 19:56:52 -07:00
LexManos
7d24c2259b Merge pull request #1199 from Adubbz/master
Enhanced the Biome Dictionary
2014-07-07 19:50:56 -07:00
LexManos
a6b7ba06c6 Merge pull request #1163 from TheCountryGamer/master
Added RenderBlockOverlayEvent
2014-07-07 19:50:04 -07:00
Lex Manos
f6471c3c08 Added World to ChunkProviderEvent.ReplaceBiomeBlocks, and exposed metadata to End and Nether generation events. Close #1201 2014-07-07 19:47:50 -07:00
Adubbz
8d2ebdf25f Enhanced the Biome Dictionary with tags based on temperature, vegetation, moisture, trees and others 2014-07-08 12:09:44 +10:00
Lex Manos
86ccfb1d68 Made EmeraldOre respect isReplaceableOreGen. Closes #1157 2014-07-07 18:55:24 -07:00
TheCountryGamer
7e7870026e Added RenderBlockOverlayEvent.java
Adds a Forge event which controls whether an overlay is rendered.
Overlays include: First-person fire, Block (when inside a block)
	and water when a player is inside a water block.

Patched for easier manipulation of event

Fixed for Lex

To be squashed

Removed Contructor

Added block XYZ parameters

TODO, the second block overlay event’s XYZ might not be correct
2014-07-07 21:49:51 -04:00
LexManos
53ce6f69e7 Merge pull request #1200 from tterrag1098/master
Add AchievementEvent
2014-07-07 18:37:53 -07:00
LexManos
81a791bac7 STENCIL buffer and DEPTH buffer, attempt a fix for GL errors. 2014-07-06 22:19:13 -07:00
LexManos
7c016d9ee8 Merge pull request #1210 from Ghosrec35/master
Added Javadoc comments for Forge Event documentation.
2014-07-06 17:16:46 -07:00
Lex Manos
5d82316059 MinecraftForge/FML@ac994e178a Scala people test your shit. 2014-07-06 17:14:25 -07:00
Lex Manos
d35098ab9e Remove the BLEND enable in rendering damage bars. And exclicitly fix blend states in some GUI elements. 2014-07-06 16:25:14 -07:00
Alex
c410a2d9fc Added Javadoc comments for Forge Event documentation. 2014-07-06 18:41:11 -04:00
cpw
0705670f1d MinecraftForge/FML@3ee86d0f3e updated gradle wrapper to gradle 2.0
MinecraftForge/FML@627ae73ea6 Merge pull request #464 from AbrarSyed/upgradle
MinecraftForge/FML@ee38c1b3f4 Fix unneeded cast causing crash in new Config GUI system.
MinecraftForge/FML@eb92c35a2f updated run configs for GradleStart/Server classes
MinecraftForge/FML@70dcf80410 Merge pull request #465 from AbrarSyed/upgradle
MinecraftForge/FML@0ebdbe77a2 Updated Scala to latest stable
MinecraftForge/FML@ddba18e6e3 Merge branch 'patch-1' of github.com:Soaryn/FML into scalaupdate
MinecraftForge/FML@220a37660b Update realms to 1.2.9
MinecraftForge/FML@abd7d0969b Merge branch 'scalaupdate'
2014-07-06 15:18:59 -04:00
LexManos
d889765b10 Merge pull request #1159 from ganymedes01/master
Added FluidStack sensitive version for Fluid's localised name
2014-07-06 12:06:58 -07:00
tterrag1098
a3c268b577 Add AchievementEvent
Allows modders to react to players receiving achievements, and cancel
them.

Fix indentation

More shortening

Down to one line...

Remove newline
2014-07-02 20:18:53 -04:00
LexManos
a59c5fbd8c Merge pull request #1197 from MrIbby/patch-1
Add RenderItemInFrameEvent
2014-07-01 12:34:41 -07:00
Gerard Bruwn
aca429f17b Add RenderItemInFrameEvent 2014-07-01 09:58:44 -07:00
Lex Manos
6db5d2ed26 Fixed issue where Fire's 'fizz' would not play for the person who extinguished the fire. 2014-06-30 11:08:18 -07:00
LexManos
7525d209b6 Merge pull request #1195 from iChun/patch-1
Fixed inverted params in FogDensity use
2014-06-29 22:47:53 -07:00
iChun
78f68847d2 Fixed inverted params in FogDensity use 2014-06-30 10:56:03 +08:00
Lex Manos
63d3fd2e84 Add config option to specify the default spawn fuzz factor for the overworld. Closes #1190 2014-06-29 18:56:22 -07:00
Lex Manos
219f5adf61 Add config option to disable attempting to creat screen with Stencil Bits. 2014-06-29 18:42:48 -07:00
diesieben07
9662b5a657 Added hook for custom PotionEffect rendering in the inventory 2014-06-30 02:06:39 +02:00
Lex Manos
086d02896f Fix creative inventory tabs not blending base don items rendered. Closes #1179 2014-06-29 16:14:57 -07:00
LexManos
8586de3222 Merge pull request #1191 from bloodmc/chunkasync
Fixed wrong method call in ChunkIOProvider.
2014-06-29 14:56:03 -07:00
bloodshot
2bfda259fa Fixed wrong method call in ChunkIOProvider.
When a chunk fails to load async, we fallback to the original sync method.
In this case, it was calling the async method twice which ended up causing
a stackoverflow.
2014-06-29 14:27:37 -04:00
cpw
5217f6f8bb MinecraftForge/FML@db219fb287 API is now able to "provide" and "own" itself. Useful for libraries without a Mod in them. To go along with this, you can now require an API, with a version, in your mod dependency string 2014-06-26 22:18:41 -04:00
cpw
3b648d826f Merge pull request #1183 from bspkrs/master
fixed dupe quotes issue with category names that require quotes when save is called more than once
2014-06-26 16:34:12 -04:00
bspkrs
f8be9a237c fixed compounding quotes issue with category names that require quotes when save is called more than once 2014-06-26 16:31:27 -04:00
cpw
ebf0e7617a Update to MC 1.7.10, bump to 10.13.0
MinecraftForge/FML@bc420dcb0b Fix Eclipse launching attribute
MinecraftForge/FML@1e0134a1ca Merge pull request #455 from rumickon/feature
MinecraftForge/FML@1c5db211af Update for release 1.7.10
MinecraftForge/FML@79a0c5e559 Merge branch 'mc179'
2014-06-26 15:07:51 -04:00
cpw
f1c7a2c134 Merge branch 'prerelease' 2014-06-26 14:57:33 -04:00
cpw
32e577d5bf Fix API incompatibilities. Should mean mods will work with new config changes. 2014-06-26 14:45:43 -04:00
LexManos
2d7f22ade8 Merge pull request #1180 from luacs1998/patch-2
Update mc version string
2014-06-25 18:49:10 -07:00
luacs1998
23c6d0ef55 Update mc version string
Or was I not supposed to?
2014-06-26 09:03:22 +08:00
cpw
6998e76d3f Fix API incompatibilities. Should mean mods will work with new config changes. 2014-06-25 20:47:33 -04:00
cpw
af23e296f2 Fix mcp release number 2014-06-25 20:19:38 -04:00
cpw
fcd13f5e71 Merge branch 'master' into prerelease 2014-06-25 20:18:42 -04:00