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

1508 commits

This branch
This branch
All branches
Author SHA1 Message Date
LexManos
c157875ecd Fix installer unintended replace. 
Updated FML:
MinecraftForge/FML@9b6525e805 Point scala downloads to our servers, Launcher doesn't like standard maven repos.
 2013-07-01 21:54:10 -07:00
LexManos
dac329bcf1 Updated FML: 
MinecraftForge/FML@29d6c875d0 Add FML Installer logo crated by @ZaverSLO https://twitter.com/ZaverSLO/status/349947190300508162
MinecraftForge/FML@3d17434510 Build installer package for the new client launcher.
MinecraftForge/FML@bf38d94756 Update json samples
MinecraftForge/FML@7037184a4e Fix up release JSON
MinecraftForge/FML@dc7d02ebf6 Fix json syntax error.
 2013-07-01 21:42:52 -07:00
LexManos
d072d91081 Release will now build a installer jar and use the standard 'target' output folder. 2013-07-01 21:42:33 -07:00
LexManos
e156ec2940 Update ToolMaterial enum helper. 2013-07-01 21:41:47 -07:00
LexManos
14295fd4b3 Merge pull request #627 from MinecraftForge/1.6 
Merge 1.6 branch
 2013-07-01 16:51:27 -07:00
LexManos
ba4637f5a3 Update src distro installer script. Source distro works now! 2013-07-01 16:38:02 -07:00
LexManos
fde224e83b Updated FML: 
MinecraftForge/FML@1229c4c4ea Fix src distrabution, and got rid of pesky common folder in eclipse workspace. src is now installable.
MinecraftForge/FML@902772ed0c Revert common folder fix, Common folder does nothing, feel free to delete it after first load.
 2013-07-01 16:33:34 -07:00
LexManos
895580de42 Merge pull request #626 from MinecraftForge/1.6 
1.6.1 Branch Merge
 2013-07-01 14:16:37 -07:00
LexManos
b8b708aab6 Try absolute path, to not confuse jenkins. 2013-07-01 12:30:19 -07:00
LexManos
df03ece63f MinecraftForge/FML@7fecf2ad6b Update mcp URL. 2013-07-01 12:04:46 -07:00
LexManos
f1dde02853 Deprecation sweep and update version to 8.9 to reflect 1.6.1 update. 2013-06-30 23:29:43 -07:00
LexManos
3df47c0250 Update release script to generate binary patches and include deobf data. 2013-06-30 23:21:28 -07:00
LexManos
17a539e173 Updated FML: 
MinecraftForge/FML@c418da353f Cleanup coremod code, server side working now.
 2013-06-30 23:20:56 -07:00
LexManos
7c53448734 Update GuiIngameForge to reflect Mojang changes in 1.6.1 2013-06-30 22:32:11 -07:00
LexManos
27779f096b Add new launch configs to dev workspace. 2013-06-30 22:31:54 -07:00
LexManos
ab1ddd99b6 1.6.1 Update 2013-06-30 19:43:27 -07:00
LexManos
fa965e5f7c Support dirty submodules in changelog script. 2013-06-30 19:43:09 -07:00
LexManos
be88b0f22f Updated FML: 
MinecraftForge/FML@110cf372eb Add deobf data to merge-common, workspace is now actually runnable!
 2013-06-30 19:42:47 -07:00
LexManos
e0d7b9e2c6 Updated FML: 
MinecraftForge/FML@8960f6869f Add windows lzma executable http://tukaani.org/xz/ He states that most things are under public domai
n, But I couldn't find an exact reference to this executable. I'm going to assume it under public domain and distribuiting it here is fine. If not someone pleas
e direct me to the apropriate license and I will act accordingly.
MinecraftForge/FML@70cfe24e67 Fix wrong project name in distro eclipse launch.
MinecraftForge/FML@7a004087f7 Add deobf data to src dist. Dont create deobf jar as we ship the lzma Added *.lzma to .gitignore
 2013-06-30 19:23:51 -07:00
LexManos
be47ccfc7e Updated FML: 
MinecraftForge/FML@6a318ddb78 Fix typo in new packages.
MinecraftForge/FML@3711da9c45 Another typo
MinecraftForge/FML@e35e4b16ff More fixups
MinecraftForge/FML@18371bd8c9 Some fixes for updated mcp code
MinecraftForge/FML@ef646d3146 Merge branch '16launch'
MinecraftForge/FML@7406b38d8a 1.6.1
MinecraftForge/FML@12c928c538 Tweak commands patch
MinecraftForge/FML@3f15cd54c2 Functional client @ 1.6.1
MinecraftForge/FML@71a92de5d9 Client launch for eclipse
 2013-06-30 18:14:19 -07:00
LexManos
63dfed9d83 Small fixup, need to Update GuiIngameForge for new HUD changes. 2013-06-30 18:13:01 -07:00
LexManos
d2144f274b Initial patch update to 1.6, Does not compile, need to update references to the old TexturePack system. 2013-06-30 05:50:11 -07:00
LexManos
7326f00a85 Update FML to 16launch branch 2013-06-30 05:29:49 -07:00
LexManos
f5747824eb Update workspace for new library structure. 2013-06-30 05:25:53 -07:00
LexManos
dac97174ff Add air check to Flint and Steel Ref: #602 2013-06-17 08:28:26 -07:00
LexManos
949b991b96 Fic Chest content gneeration delegate call. Cloases #609 2013-06-17 08:27:57 -07:00
LexManos
1173e9074d Bump Forge revision and mark recomended. 2013-06-15 00:19:35 -07:00
LexManos
f425a367cd Add air checks to BlockSand falling and Piston pushing. Please report any other issues with custom 'Air' blocks in issue #602 2013-06-14 12:08:24 -07:00
LexManos
0ec313abb1 Added EntityLiving to Block.isLadder arguments, deperacating older version. New parameter has the possibility of being null, so modders must take care. Closes #608 2013-06-14 11:51:28 -07:00
LexManos
ff95f73cd1 Merge pull request #607 from heldplayer/tripwires 
Fix tripwire patches for solid side checks
 2013-06-14 11:30:03 -07:00
Heldplayer
060bacb196 Fix tripwire patches for solid sides 2013-06-14 15:39:20 +02:00
Christian
3794713dd9 Fix server patch FML update 
Updated FML:
MinecraftForge/FML@22738de028 Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer..
MinecraftForge/FML@05a854cd2a Small tweaks to the mcp data. Nothing major..
 2013-06-11 14:57:23 -04:00
Christian
ebd22c3abd Make glass panes and iron fences connect to block sides based on solidity. This does change IBlockAccess, so anything with a custom IBlockAccess may need to implement the new method. 2013-06-10 16:57:34 -04:00
LexManos
47b5e28c91 Forgot most important side, release script. 2013-06-10 02:27:39 -07:00
LexManos
47f87ed6b5 Fixed changelog generation. 2013-06-10 02:06:43 -07:00
LexManos
c1ba77eb3f Fix AIOOB exception in crash reporting if exception does not have a stack. Possible, but odd. 2013-06-10 01:25:25 -07:00
LexManos
031e7a5e7e Add NPE protection to refernce to MinecraftServer.worldServer 2013-06-08 19:36:57 -07:00
LexManos
da75e1b68b Fix hoes being able to till dirt under other blocks, and made it look for air type blocks. 2013-06-08 19:36:02 -07:00
LexManos
5ea9aff894 Fix Air block check in BlockPortal. 2013-06-08 18:38:22 -07:00
LexManos
9034862024 Add NPE protection to ItemStack delegates. Closes #601 
Also cleaned up the names of said delegates, we do not have to follow MCP's crowdsourced names as they are very bad.
Redirected damage through setItemDamage to allow items to have finder control of breaking.
 2013-06-08 14:02:53 -07:00
Lunatrius
0c308a5f07 Added rotation support for all vanilla blocks that can be rotated. 2013-06-08 21:35:42 +02:00
LexManos
2bbb3ee0ca Disable ImageIO's File based cache, should speed up texturepack loading/stitching. 2013-06-08 12:20:49 -07:00
Christian
24e67b857c Updated FML: 
MinecraftForge/FML@24c4056651 Add in an optional modid identifier for @SidedProxy. It's main use is when both scala and java @Mods reside in the same package, and you want the @SidedProxy behaviour for a specific @Mod language type. In general it should not be needed otherwise.
MinecraftForge/FML@cd0466395a Fix sysout with trailing messages after a newline
 2013-06-06 12:16:44 -04:00
Christian
ab62ca7b1f Merge branch 'master' into newliquid 2013-06-06 09:39:19 -04:00
Christian
f515ebcb12 Updated FML: 
MinecraftForge/FML@6f3da97365 Don't throw an exception if the scala adapter find a java proxy. I may add some distinguishers to @SidedProxy so you know which mod it's for.
MinecraftForge/FML@59fe905695 Don't continue trying to send events to mods that depend on errored mods.
 2013-06-04 20:16:00 -04:00
LexManos
5f750197ac Merge pull request #560 from jk-5/master 
RenderGameOverlayEvent.Post ALL is not called in GuiIngameForge
 2013-06-03 12:21:34 -07:00
LexManos
cea0edfdb1 Ignore registration of a object that is already registered. Preventing duplicate callback invocations. Thanks King_Lemming for pointing this out. 2013-06-02 21:44:34 -07:00
LexManos
0e571eeb19 Add cache for ASM Event Handler bridge classes, should not need to redefine a class to invoke the same method on different instances. 2013-06-02 21:27:09 -07:00
LexManos
15d158161e Make changelog generation non-fatal untill we get jenkins issue figured out. 2013-06-02 16:26:06 -07:00
Christian
cc520e40ce Fix isAir check to see if a portal can light. Should fix w/Railcraft and others 2013-06-02 14:51:41 -04:00