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

1533 commits

This branch
This branch
All branches
Author SHA1 Message Date
tommy1019
077e05e0ed Fixed fluids eating each other 
Fluids check for other fluids density before flowing, if their density
is higher they can flow into the other fluid, if not they can't.
 2013-07-26 16:25:40 -05:00
tommy1019
a42369e081 Fluid Render Fix 
Formatting
 2013-07-25 18:38:29 -05:00
LexManos
6397939c9e Merge pull request #665 from copyboy/master 
Fix getArmorTexture by passing it the subtype
 2013-07-24 13:18:31 -07:00
copyboy
c9af365d44 Fix getArmorTexture by passing it the subtype 2013-07-24 22:12:38 +02:00
LexManos
b6d543f15e Re-added deprecated liquids system. To be removed next major MC versions after issues with Fluids are fixed. (reverse-merged from commit 9b5208fa30) 
This WILL be removed and should not be developed against aside for a temporary 1.6 release.
 2013-07-22 15:19:35 -07:00
LexManos
8c3ebc7f87 Remove SideOnly(Client) in IBlockAccess.isAirBlock 2013-07-21 11:01:38 -07:00
LexManos
ee70b21460 MinecraftForge/FML@10b16d32da Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:38:53 -07:00
LexManos
acb6777ab5 General code cleanup of Fluid system. Made Fluid icons and associated functions non-sided. 2013-07-16 21:40:49 -07:00
LexManos
f7ab5684e9 MinecraftForge/FML@3f21a2c1b4 Stupid spaces and windows escaping -.- 2013-07-16 14:35:22 -07:00
LexManos
8a8af5265e Package 'version.json' with universal jar for maunchers to use. It's the json used by the vanilla Minecraft launcher for Forge. 2013-07-16 13:55:31 -07:00
LexManos
f72d672e0d MinecraftForge/FML@b2958c9066 Add quotes for paths with spaces -.- 2013-07-16 13:54:08 -07:00
LexManos
094c2bca2e MinecraftForge/FML@9520978b81 Use a temporary file for recompile's command line to combat command length to long issues. 2013-07-16 13:12:46 -07:00
LexManos
380c4ad2da Updated FML: MinecraftForge/FML@4981aa3421 Fix potential NPE in villager skin registry. Closes #678 2013-07-16 10:34:54 -07:00
LexManos
e57f1c230c Merge pull request #675 from Soaryn/patch-1 
Fixes Vanilla Fluid Still Icon Setters
 2013-07-15 22:36:56 -07:00
Soaryn
88e0ecf2cf Fixes Vanilla Fluid Still Icon Setters 
Fixes null icons from being set for both the still water/lava icons, and sets the correct Icon.
 2013-07-16 01:27:39 -04:00
LexManos
56ab2fd797 Updated FML: MinecraftForge/FML@c48b48ee15 Fix server launching. 2013-07-15 10:58:11 -07:00
Christian
81cce7b6ac Fix for new location of mcp logo. 2013-07-14 14:22:57 -04:00
Christian
745fa93f3f Updated FML: 
MinecraftForge/FML@0378355c37 The server.classpath generates the runtime manifest, so it needs the non-debug asm jars.
MinecraftForge/FML@a3f48734ff Fix up jar sanity check code. FML validation of the jar works now and doesn't derp classloading.
MinecraftForge/FML@9947ba8503 Fix logo handling. no more NPE if the logo can't be found. Also, fix location of mcp logo now.
 2013-07-14 13:47:53 -04:00
LexManos
c5af747da9 Monkey patch to try and make print flush properly. 2013-07-12 04:08:29 -07:00
LexManos
c40499ab05 Update changelog generator to point to new jenkins. 2013-07-12 03:09:54 -07:00
LexManos
2e1aa99f54 MinecraftForge/FML@c625ef3009 Update Forge signature for new private key 2013-07-12 03:09:24 -07:00
LexManos
70a6a316d7 Updated FML: 
MinecraftForge/FML@7348929819 Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala.
MinecraftForge/FML@6de36d78f5 Coremods now have a primitive dependency capability. Also, we search mods dir for special "TweakClass" manifests. These are using the vanilla tweak mechanism to inject into Minecraft. Helpful for other "platform" systems, when you don't want to have to deal with json changes!
MinecraftForge/FML@d4b30422b6 Update build and eclipse workspaces for debug asm.
 2013-07-12 00:34:32 -07:00
LexManos
e418dddbcf MinecraftForge/FML@b9f4b02cb0 Kill mcp's truncate method, for more useful logs. 2013-07-10 15:24:53 -07:00
LexManos
bf127348c9 Merge pull request #661 from Adubbz/master 
Made eating particles compatible with metadata
 2013-07-10 15:24:07 -07:00
Christian
75907e3815 Updated FML: 
MinecraftForge/FML@e44e8b3112 Force a global asset scan prior to mod construction : you should be able to reference assets anywhere in your mod now.
MinecraftForge/FML@20e93a412e Fix up logos in the mod screen. Clean up some unnecessary casts and suppressions, use the -debug asm library at dev time, since it contains full symbols and code in compiled form.
 2013-07-10 17:30:45 -04:00
Adubbz
c4ad7c3e2c Made eating particles compatible with metadata 
Removed extra spaces

Made eating particles compatible with metadata
 2013-07-10 20:39:15 +10:00
LexManos
562e8e8021 Re-add reverted patch AGAIN cpw check your commits -.- 2013-07-09 12:56:34 -07:00
Christian
c3fbd27a8d Updated FML: 
MinecraftForge/FML@bab4d87ce7 Update FML for new stealth update for 1.6.2
 2013-07-09 15:36:47 -04:00
Christian
a990c0bdc8 Remove forge ISidedInventory, deprecated since 1.5. 2013-07-09 11:38:54 -04:00
Christian
561b0fbe55 Allow optional rider interaction for entities, thanks for the suggestion Vswe. 
Updated FML:
MinecraftForge/FML@7af5c21d74 @InstanceFactory was set to look for Fields instead of methods
MinecraftForge/FML@bc9d1fe657 Merge pull request #254 from CaptainShadows/patch-1
 2013-07-09 11:23:49 -04:00
Christian
475918a1ca Updated FML: 
MinecraftForge/FML@97269a5e3d Decode the file URL. Hopefully will make things work more..
MinecraftForge/FML@d4d522c597 And don't forget to remove the test code
 2013-07-09 08:33:05 -04:00
LexManos
a85d82a859 MinecraftForge/FML@c913258ca3 Disable signature check of client for now, it's broken. 2013-07-09 05:04:50 -07:00
LexManos
ae97ad2bca Updated FML: 
MinecraftForge/FML@dfa3a2665d Add MC Version to installed version name.
MinecraftForge/FML@e91431fb70 Don't validate signatures on servers, they are not signed.
MinecraftForge/FML@c7ab872c85 Temporarily disable GuiModList's Mod logos.
 2013-07-09 03:35:52 -07:00
LexManos
8eddb7f1b9 Updated FML: 
MinecraftForge/FML@c997f2adbc FML now verifies that the minecraft jar is correct and intact. This is intended to discourage those who think that modifying the minecraft jar is still acceptable.
MinecraftForge/FML@0db4624b27 Don't initialize the server.
MinecraftForge/FML@4fa375683f Fix NPE in new debug line when patch targets don't exist.
 2013-07-09 01:30:22 -07:00
LexManos
29fabb12e0 Proper return for getRegisteredFluidContainerData thanks Soaryn. Ref issue #634 2013-07-08 18:54:03 -07:00
LexManos
34bcca2640 Fix accedential reverted patch. 2013-07-08 18:35:34 -07:00
Christian
38bd039a93 Make resourcelocation the class available on the server. 2013-07-08 19:40:15 -04:00
Christian
033eedb50f Drop two domain related fixes that have been applied in vanilla. 
Updated FML:
MinecraftForge/FML@c47d08c89d Tweak debug data on patched classes
MinecraftForge/FML@dbf5fe38ce We now generate an adler32 checksum for each patched file and verify at load time that they match. Mismatch won't crash, but will emit a big warning..
MinecraftForge/FML@e88a0cd13f Update for stealth update. Thanks mojang!
MinecraftForge/FML@2336002f20 The game is going to exit in face of patch mismatch, unless you force it to run with fml.ignorePatchDiscrepancies in the system properties.
 2013-07-08 14:44:51 -04:00
LexManos
51ca5e028b Bump version to 9.10 for new MC version and removal of Fluids. 2013-07-07 14:05:48 -07:00
LexManos
9b5208fa30 Remove deprecated Liquids API, Use new Fluids system as replacement. 2013-07-07 14:05:23 -07:00
LexManos
85fd1d010d Updated FML: 
MinecraftForge/FML@1d0384f8f6 Update for 1.6.2 and MCP 8.04
MinecraftForge/FML@111b0216fd Add the jsons for 1.6.2
MinecraftForge/FML@6f96d89e2b Update eclipse workspaces for 1.6.2
 2013-07-07 14:03:26 -07:00
Christian
499610e44f Updated FML: 
MinecraftForge/FML@c97ac284a5 Update ModLoaderFuelHelper.java
MinecraftForge/FML@3a200e901e Fix coremod injection into main system. Should stop double-dipping coremods.
MinecraftForge/FML@2676c8999c Update mcp data. fixes #248
MinecraftForge/FML@5990e29af7 Merge pull request #247 from jk-5/patch-1
MinecraftForge/FML@adc8972277 Add cascadedTweaks. This will allow simple coexistence for any other mod framework using the tweaker system as well. Hi Voxel and LiteLoader!
 2013-07-07 00:58:32 -04:00
LexManos
13294083a9 Merge pull request #645 from XCompWiz/bedspawn 
Makes player-specific spawnpoints dimension aware
 2013-07-06 14:41:07 -07:00
XCompWiz
5f203ce808 Makes player-specific spawnpoints dimension aware 
Makes ServerConfigurationManager correctly get player-specific spawn
point for the target dimension
Changes EntityPlayer to store and save a (bed) spawn point for every
dimension, as well as transfer them to respawn "clones"
 2013-07-06 16:24:37 +03:00
LexManos
dfc26937ca Re-gather list of Icons when atlas textures are stitched, allows for addition/removal of blocks/items after the atlas's inital constrction. 2013-07-05 22:50:55 -07:00
LexManos
22be4b49d5 Fix enchantment effect on single pass items. Closes #644 2013-07-05 16:55:42 -07:00
LexManos
bc932a28ae Merge pull request #642 from MinecraftForge/newliquid 
New liquid system
 2013-07-04 13:11:36 -07:00
LexManos
e9f1c83ff8 Mark old liquid system as deperated to be removed next Minecraft release. 2013-07-04 12:39:49 -07:00
LexManos
30be6d4bab Merge remote-tracking branch 'refs/remotes/origin/newliquid' into newliquid 2013-07-04 12:17:36 -07:00
Christian
1169ba9efb Merge branch 'master' into newliquid 2013-07-04 12:07:32 -07:00