keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
2271 commits 1 branch 2 tags 103 MiB
Commit graph

2271 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
cpw
bcda92e941 Merge branch 'bspkrsgui' 2014-06-25 20:16:20 -04:00
cpw
013c0b0feb MinecraftForge/FML@701d98eafa Added config GUI system 
MinecraftForge/FML@50164db5c1 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
MinecraftForge/FML@7eb36a1481 Merge branch 'bspkrsgui'
 2014-06-25 20:15:08 -04:00
cpw
24c05a73ce Merge branch 'master' of github.com:bspkrs/MinecraftForge into bspkrsgui 
Conflicts:
	src/main/resources/assets/forge/lang/en_US.lang
 2014-06-25 20:13:36 -04:00
cpw
ced81b5c93 Clean patch cruft. 2014-06-25 20:09:42 -04:00
cpw
c7f9d5a529 Fix new method with Side.CLIENT when it shouldn't have it. Closes a bunch of reports of problems. 2014-06-25 18:59:14 -04:00
cpw
cbc873bc8b MinecraftForge/FML@701d98eafa Added config GUI system 
MinecraftForge/FML@50164db5c1 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
MinecraftForge/FML@7eb36a1481 Merge branch 'bspkrsgui'
MinecraftForge/FML@96a7e14a45 Merge branch 'master' into mc179
MinecraftForge/FML@f45f18b1d7 Fix accessing guava from transformers
MinecraftForge/FML@8f7adced47 Fix library issue. mojang auth requests newer libs, so we get them at dev time. But the mojang json doesn't refer them at runtime. So there's a lib mismatch. Fortunately all are available at mojang, so we can update the json.
 2014-06-25 18:31:02 -04:00
cpw
c8b3719810 MinecraftForge/FML@5d6dc5dce3 Fix up other exit points. Should stop process hangs for clean exits. 
MinecraftForge/FML@8a240ec3c7 Merge branch 'master' into mc179
MinecraftForge/FML@0cd5ef6bb7 Fix NPE when no FMLAT is defined
 2014-06-25 09:15:37 -04:00
cpw
4c26057a4e MinecraftForge/FML@5d6dc5dce3 Fix up other exit points. Should stop process hangs for clean exits. 2014-06-24 22:16:39 -04:00
cpw
0bbee11b3c MinecraftForge/FML@e152984538 Add support for mod access transformers without a coremod requirement. Use the "FMLAT" manifest attribute, with a space separate list of files that live in the 'META-INF' directory. They should conform to standard AT formatting. 2014-06-24 22:05:38 -04:00
cpw
729d8fb721 MinecraftForge/FML@06ab104c9a Force the descriptors to the right type for the field they're referencing. Fixes the sand issue 2014-06-24 18:35:48 -04:00
Lex Manos
7ba54ffd48 Fix flower pots not droping the items that are inside them. 2014-06-23 22:06:52 -07:00
Lex Manos
256d865db6 Update to 1.7.10-pre4. 2014-06-23 21:55:16 -07:00
Christian
1275aa732e Null check the Item in the supplied stack as well as the stack itself. 2014-06-22 14:47:24 -04:00
Christian
4778c33902 And fix firing for single player loading. 2014-06-22 14:39:23 -04:00
Christian
127605ec3e Fix derpity derp. 2014-06-22 10:11:32 -04:00
Christian
f7736e9a0a Fire an event when a player loads or saves from disk. Mods that want to load an additional 
player related file from the players dir can now do so in that event.
 2014-06-21 17:38:21 -04:00
Christian
ea7c11baf4 Some patch offsets 
MinecraftForge/FML@7219061b05 Also patch in warnings for Vec3Pool - similarly removed.
MinecraftForge/FML@dff2204558 FML now sets a security manager (FINALLY!). It's primary purpose at this point is to catch rogue calls to System.exit so that they can cause a proper crash report, rather than silently abandoning the game.
 2014-06-21 17:34:52 -04:00
LexManos
755dd9b954 Merge pull request #1164 from lumien231/Fix-DimensionCrash 
Fixes a server crash caused by a player joining that is in a non existen...
 2014-06-20 17:31:45 -07:00
Lumien
a21ad8fa9d Fixes a server crash caused by a player joining that is in a non existent dimension 2014-06-20 11:18:23 +02:00
LexManos
9701e944c2 Merge pull request #1162 from Thog92/1.7-biome 
Add missing 1.7 biomes to BiomeDictionary
 2014-06-19 11:26:38 -07:00
Thog92
a905fe578b Add missing 1.7 biomes to BiomeDictionary 2014-06-19 19:06:27 +02:00
ganymedes01
85497cbf6e Added FluidStack sensitive version for Fluid's localised name 
Would be helpful for determining names for more complex FluidStacks (with tag compounds for example)
 2014-06-18 15:26:14 +01:00
LexManos
5ac6f2289b Merge pull request #1155 from Zarathul/master 
Added soft return for modders passing invalid negative ids to OreDictionary.getOreName. Warning: WILL Error in 1.8+
 2014-06-16 19:49:13 -07:00