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

5731 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian
a80049eca2 Pass obfuscation status to coremods 2013-03-12 21:06:37 -04:00
Christian
546ceaa9d8 Updated FML: 
MinecraftForge/FML@d88db6c0cf Fix up deep tree deobfuscation
 2013-03-12 21:06:07 -04:00
Christian
83d4be5a05 Some tweaks to the liquid dictionary, to allow for canonical liquid stacks for things like rendering 2013-03-12 20:33:50 -04:00
Christian
78732231d4 Fix up deep tree deobfuscation 2013-03-12 20:33:19 -04:00
LexManos
ce2ebc1d04 Updated FML: 
MinecraftForge/FML@7b722bfcd6 Update MCP for latest PR silent update.
MinecraftForge/FML@c6dab815f4 Missed joined.exc, must fix scripts.
 2013-03-12 15:21:49 -07:00
LexManos
71fc1afd0d Missed joined.exc, must fix scripts. 2013-03-12 15:12:49 -07:00
LexManos
619c97a634 Update MCP for latest PR silent update. 2013-03-12 15:02:58 -07:00
LexManos
ee1460d8c4 Removed get/setTextureFile from Block, nolonger used. 2013-03-12 14:47:05 -07:00
LexManos
dfdef18d35 Updated FML: 
MinecraftForge/FML@a90504315e Readjust size of mods button when Minecraft Realms button is enabled.
 2013-03-11 16:28:19 -07:00
LexManos
81d9e8315c Readjust size of mods button when Minecraft Realms button is enabled. 2013-03-11 16:20:56 -07:00
Christian
529062d73f Fix the oredictionary for the new recipe wildcard value of Short.MAX_VALUE. 2013-03-11 17:43:23 -04:00
Christian
4d6c135182 Updated FML: 
MinecraftForge/FML@3765ceb02d Update MCP, fixes the "broken texture packs" problem.
 2013-03-11 16:37:53 -04:00
Christian
1f4098d779 Update MCP, fixes the "broken texture packs" problem. 2013-03-11 16:31:26 -04:00
Christian
94a0203882 Updated FML: 
MinecraftForge/FML@dab22f5b74 Fix "0 mods" display when installed in forge.
 2013-03-10 12:14:40 -04:00
Christian
f08dec0d63 Fix "0 mods" display when installed in forge. 2013-03-10 12:12:22 -04:00
Christian
811c53e518 Updated FML: 
MinecraftForge/FML@179c504746 Simplify logic in tick start/end
MinecraftForge/FML@29edd242cd Fix coremods without a manifest crashing the game. Closes #181
MinecraftForge/FML@ac16845fc4 Fix demo mode crash. Closes #187
MinecraftForge/FML@984291cee9 Fix supertype parsing to handle null superclass (Hi Object!). Closes #160
MinecraftForge/FML@f647929993 Merge branch 'master' of github.com:Uristqwerty/FML
MinecraftForge/FML@b301e8e4c1 Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189
 2013-03-10 01:34:45 -05:00
Christian
afb18ee321 Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189 2013-03-10 01:25:36 -05:00
Christian
b6d98f47a8 Merge branch 'master' of github.com:Uristqwerty/FML 2013-03-10 01:22:24 -05:00
Christian
424ba13bb2 Fix supertype parsing to handle null superclass (Hi Object!). Closes #160 2013-03-10 01:20:08 -05:00
Christian
72f55cfd08 Fix demo mode crash. Closes #187 2013-03-10 01:15:16 -05:00
Christian
d3d4e7683c Fix coremods without a manifest crashing the game. Closes #181 2013-03-10 01:05:31 -05:00
Christian
4175d2f306 Updated FML: 
MinecraftForge/FML@591e65fa1a Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf."
MinecraftForge/FML@2a779ec328 Try a different way of remapping the fields. Should work because it's userspace, not relauncher space
MinecraftForge/FML@ca2d8bd834 Fix reflection helper: it needs to unmap the classname to find the field maps.
 2013-03-09 17:59:21 -05:00
Christian
796f70b545 Fix reflection helper: it needs to unmap the classname to find the field maps. 2013-03-09 17:58:18 -05:00
Christian
46b909e818 Try a different way of remapping the fields. Should work because it's userspace, not relauncher space 2013-03-09 17:36:31 -05:00
Christian
a713300e0a Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf." 
This reverts commit 485db6be2e6b54a9a523a2b06e0d886792b0826a.
 2013-03-09 17:32:11 -05:00
Christian
d5edaea88f Updated FML: 
MinecraftForge/FML@485db6be2e Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf.
 2013-03-09 17:21:13 -05:00
Christian
c33cd0d9ea Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf. 2013-03-09 17:19:48 -05:00
Christian
c9f6412392 Updated FML: 
MinecraftForge/FML@25f3fcad46 Fix up some relauncher stuff: the vanilla applet works now, as do other applets. Deobf data is resolveable for them too.
 2013-03-09 15:30:32 -05:00
Christian
0d3d03ab83 Fix up some relauncher stuff: the vanilla applet works now, as do other applets. Deobf data is resolveable for them too. 2013-03-09 15:25:58 -05:00
LexManos
4a0393f613 Updated FML: 
MinecraftForge/FML@6bf7c9878c Fixed srg name of minecraftDir for runtime deobf.
 2013-03-09 11:57:13 -08:00
LexManos
d24461c50a Fixed srg name of minecraftDir for runtime deobf. 2013-03-09 11:52:40 -08:00
Christian
d12554a3e2 Updated FML: 
MinecraftForge/FML@95d0ff18cd Fix runtime deobfuscation for remapped inner classes
 2013-03-09 14:15:14 -05:00
Christian
f13437df46 Fix runtime deobfuscation for remapped inner classes 2013-03-09 14:06:39 -05:00
Christian
170d22e5ac Refresh patch 2013-03-09 13:39:12 -05:00
LexManos
3d8b247884 Updated FML: 
MinecraftForge/FML@86a9c7d359 Fixup reobfusication of server code if present.
MinecraftForge/FML@8e7956397d Just enable server side compile, and warn not to complain tous.
MinecraftForge/FML@889efc1c0a Fixes GameRegistry.registerBlock
MinecraftForge/FML@fe1623a36a Merge pull request #195 from RainWarrior/snapshot15
MinecraftForge/FML@62f5adf8e2 Revert "Fix modlist to use the new texture binding functions, i think"
MinecraftForge/FML@58ee06ea8e Some fixes for the snapshot
MinecraftForge/FML@368a2245ef Merge branch 'snapshot15'
MinecraftForge/FML@1eba1dfdc0 Fix accidental commands.patch overwrite
MinecraftForge/FML@ebdb166ec8 Merge branch 'snapshot15'
MinecraftForge/FML@450dd8313c Fix up some small things, merging into mainline
MinecraftForge/FML@1642bad402 Fix Multi-part entity children ID issue, mobs with custom spawning must deal with child ids themselves.
 2013-03-09 10:10:22 -08:00
LexManos
a8da44fb8f Fix Multi-part entity children ID issue, mobs with custom spawning must deal with child ids themselves. 2013-03-09 10:07:41 -08:00
LexManos
14c362196e Merge remote-tracking branch 'origin/snapshot15' 2013-03-09 09:53:43 -08:00
Christian
a98bf99037 Fix up some small things, merging into mainline 2013-03-09 12:39:36 -05:00
Christian
23ea71130f Merge branch 'snapshot15' 2013-03-09 12:26:14 -05:00
Christian
1176144590 Fix accidental commands.patch overwrite 2013-03-09 12:25:24 -05:00
Christian
9b8c65d3c2 Merge branch 'snapshot15' 2013-03-09 12:19:37 -05:00
Christian
3c14424e30 Some fixes for the snapshot 2013-03-09 12:10:13 -05:00
Christian
1a3022ae7a Revert "Fix modlist to use the new texture binding functions, i think" 
This reverts commit 48544db690bf213a322954b7bd39cb3a8ca59bb1.

Conflicts:
	client/cpw/mods/fml/client/GuiModList.java
 2013-03-09 11:12:12 -05:00
cpw
3f197d0b30 Merge pull request #195 from RainWarrior/snapshot15 
Fixes GameRegistry.registerBlock
 2013-03-09 07:07:48 -08:00
RainWarrior
c2fce94d6b Fixes GameRegistry.registerBlock 2013-03-09 14:06:12 +04:00
LexManos
4945bd9d0f Fix reobf call. 2013-03-09 01:00:52 -08:00
LexManos
9a72d50dec Early define CrashReport classes to combat invalid crash details. 2013-03-08 20:31:37 -08:00
LexManos
025d4f8f25 Updated FML: 
MinecraftForge/FML@f1c6bdd57d Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility
MinecraftForge/FML@0419b9d975 Update MCP info for latest
 2013-03-08 20:16:35 -08:00
Christian
2dece4d42a Update MCP info for latest 2013-03-08 23:14:30 -05:00
Christian
07513ff7c8 Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility 2013-03-08 23:13:39 -05:00