Commit Graph
7785 Commits
Author SHA1 Message Date
Christian b985ec886a Ignore binpatch 2013-06-24 16:03:54 -04:00
LexManos 3e346cb8b2 Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'. 2013-06-23 23:06:25 -07:00
LexManos 82c0fbce60 Upgraded minecraft downloader to work with new launcher's asset/library system
New parameter:
  --no-assets: Disables the downloading of minecraft's asset tree, recomended that build servers supply this flag to prevent downloading of useless data.
2013-06-20 16:23:15 -07:00
James af2b5eb6f6 Add an InputStream constructor to WavefrontObject
It is said that Resource Packs will return InputStreams. And I like putting my models into texture packs which, obviously, give InputStreams rather than URLs.
2013-06-19 15:57:44 -06:00
Ross Swartz b207111c50 Update OreDictionary.java 2013-06-17 19:09:40 -03: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
Christian 39858c6ead No more debug please 2013-06-15 01:11:29 -04:00
Christian 14ddd2be05 Fix build script. Add a sample JSON file. You'll need the newest Launcher code to run this. 2013-06-14 21:00:15 -04:00
Christian 30d836fa36 More fixups for new launcher model 2013-06-14 20:45:52 -04:00
Christian 07a5efe612 Merge in binpatch and use launcher 2013-06-14 17:21:49 -04: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 21240df8bc More tweaks 2013-06-14 09:32:51 -04:00
Christian a923a2c142 Server side tested and working. Setup is complex atm. That will change. 2013-06-13 09:57:55 -04:00
Christian 4802d04bfd First cut of runtime binary patching. Needs some work to actually test it in a real scenario.. 2013-06-12 08:53:10 -04:00
Ross Swartz 05b2a19bac Add stone and cobblestone to Ore Dictionary 2013-06-11 23:58:05 -03: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 83ed6fa32c Small tweaks to the mcp data. Nothing major.. 2013-06-11 14:47:23 -04:00
Christian c170b98a8c Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer.. 2013-06-11 14:41:19 -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 146e773264 Fix sysout with trailing messages after a newline 2013-06-06 11:52:15 -04:00
Christian 1261c7a3e0 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.
2013-06-06 10:05:34 -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
Christian fea7a25a86 Don't continue trying to send events to mods that depend on errored mods. 2013-06-04 13:59:04 -04:00
Christian 8602848f2c 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. 2013-06-04 12:51:46 -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
Christian 4d626bf025 Patch village distance checking to use floats instead of ints, to avoid int wrapping 2013-05-28 23:36:09 -04:00
LexManos 40afc35985 Fix arbitrary GUIContainer text coloring by forcing lighting to be disabled. Closes #594 2013-05-27 16:13:05 -07:00
Christian 50992f2112 Merge branch 'master' of github.com:KingLemming/MinecraftForge into newliquid
Conflicts:
	common/net/minecraftforge/common/network/ForgePacket.java
2013-05-27 18:16:24 -04:00
Christian 227d4eeefa Updated FML:
MinecraftForge/FML@843a13c1ab Try and clean up cycle detection output a bit
MinecraftForge/FML@82e9de8641 More tweaks to the mod sorting code
MinecraftForge/FML@ac97370f94 Add in a pretty sorting error screen
MinecraftForge/FML@f1d68ed4c8 Throw the sorting exception
MinecraftForge/FML@edc1fb24e2 Send the "suspect list", and print the suspect versions
2013-05-27 11:10:46 -04:00
Christian 2a064ffdc7 Send the "suspect list", and print the suspect versions 2013-05-27 11:03:23 -04:00