Commit Graph

1461 Commits

Author SHA1 Message Date
LexManos ae59f1abb4 Move resource location resolution down to TextureAtlasSprite and allow for sprites that are not stitched. 2013-07-02 13:57:50 -07:00
Christian c0b09854b3 Start: f1b533ad87ea08d6e62259c59779bcec1636e2fe
End: f21cd286ca8e974b75536224a38cc0dacaca8454
Updated FML:
MinecraftForge/FML@f21cd286ca Resource packs, part two. FML mods are now resource packs. Vanilla will scan anything under 'assets' and turn it into a resource prefix. Use resourcelocations to look stuff up.
2013-07-02 13:53:28 -04:00
LexManos 2b61ea417b Update ChestGenHooks for new Dungeon chest strcture. 2013-07-02 02:37:05 -07:00
LexManos e57886e05a Fix resource domain when loading icon. Textures should be located in /assets/{domain}/textures/{block|item}/{name}.png Same strcutre as before except 'assets' instead of 'mods'. 2013-07-02 02:06:12 -07:00
LexManos b0520f3656 Update filler block to prevent useless console warning. 2013-07-02 02:04:28 -07:00
LexManos 3e9349bf7b Make Block.setIconName public 2013-07-02 02:04:04 -07:00
LexManos d5549d770d Fix bound texture in Controls screen, Closes #631 and #629 2013-07-01 23:35:03 -07:00
LexManos 4034cfe9dc Updated FML:
MinecraftForge/FML@5a97d183df Remember to update your patches!!!!
MinecraftForge/FML@f1b533ad87 Keep these on our servers until the launcher is actually fixed -.-
2013-07-01 23:33:48 -07:00
LexManos 7864f2c8ea Updated FML:
MinecraftForge/FML@91ecf71109 Fix -rel json
MinecraftForge/FML@efc369ee83 Fix EventHandler annotation.
MinecraftForge/FML@fbd57b3264 Mods are now loaded as resource packs. Vanilla will scan for valid prefixes based on subdirs of 'ass
ets' which can then be referenced as ResourceLocations with the "<prefix>:path" notation.
2013-07-01 22:54:19 -07:00
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
LexManos 2bbb3ee0ca Disable ImageIO's File based cache, should speed up texturepack loading/stitching. 2013-06-08 12:20:49 -07:00