e9f1c83ff8
Mark old liquid system as deperated to be removed next Minecraft release.
2013-07-04 12:39:49 -07:00
30be6d4bab
Merge remote-tracking branch 'refs/remotes/origin/newliquid' into newliquid
2013-07-04 12:17:36 -07:00
1169ba9efb
Merge branch 'master' into newliquid
2013-07-04 12:07:32 -07:00
33ec5cdc44
Updated FML: MinecraftForge/FML@54e06e841d Move Resource refreshing until affter postInit.
2013-07-03 22:29:42 -07:00
be14c33ed1
Add missing air checks to WorldGenTrees and ChunkCache Closes #593
2013-07-03 21:48:51 -07:00
b12872eed1
Fix compile errors temporarily, dont use till updated to new system.
2013-07-03 21:34:49 -07:00
35caa32ad1
Merge pull request #539 from richardg867/techne-1
...
Techne model importer
2013-07-03 21:21:16 -07:00
98aab2083b
Render pass sensitive version of Item.hasEffect, Closes #517
2013-07-03 21:14:59 -07:00
2b588ebce6
Fix lether item rendering colors.
2013-07-03 20:41:27 -07:00
d4ba95f606
Add hook for EntityWither trying to destroy a block.
2013-07-03 20:29:41 -07:00
83504eb2e1
Merge pull request #600 from Lunatrius/rotation
...
Added rotation support for all vanilla blocks that can be rotated.
2013-07-03 20:16:25 -07:00
7f5ec0eaef
Fix domain issue with SoundPool entries.
2013-07-03 19:31:54 -07:00
68ba3a84d6
Updated FML:
...
MinecraftForge/FML@7ce84491d1 Fix missing argument and startclient/startserver support.
2013-07-03 19:31:31 -07:00
125b134d87
Updated FML:
...
MinecraftForge/FML@155e846818 Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now.
MinecraftForge/FML@3f4bf61ae6 Update key
MinecraftForge/FML@4545beb49d Add deobf-data to setup env.
MinecraftForge/FML@e24f949517 Fix eclipse workspaces and launch configurations.
MinecraftForge/FML@532bee7ce1 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues.
2013-07-03 18:54:47 -07:00
f9236c4c98
Include MANIFEST file from FML's universal.jar, makes the jar runnable now!
2013-07-03 06:26:47 -07:00
02e857827d
TEMPORARY fix for MCP mapping issue.
2013-07-03 06:26:12 -07:00
7e5560e60d
Update dev worksapce: Proper natives location and new server launch profile.
2013-07-03 06:25:40 -07:00
f35783f0fb
Updated FML:
...
MinecraftForge/FML@6f0eedc9a6 Fixed ClassCastException when loading ModLoader mods
MinecraftForge/FML@8844554da6 Merge pull request #243 from jrtc27/modclassloader
MinecraftForge/FML@7aa7221756 Fix transformer search
MinecraftForge/FML@5f7df5e742 Revert "Keep these on our servers until the launcher is actually fixed -.-"
MinecraftForge/FML@ad79b9ed86 Fix up some deprecation warnings, and clean up coremod code that's going away.
MinecraftForge/FML@ba3707af22 More javadoc cleanup
2013-07-02 18:16:04 -07:00
e74ef3e86e
Attempt to gather lastBuild information to fix ChangeLog's off-by-one issue.
2013-07-02 15:18:23 -07:00
ae59f1abb4
Move resource location resolution down to TextureAtlasSprite and allow for sprites that are not stitched.
2013-07-02 13:57:50 -07:00
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
2b61ea417b
Update ChestGenHooks for new Dungeon chest strcture.
2013-07-02 02:37:05 -07:00
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
b0520f3656
Update filler block to prevent useless console warning.
2013-07-02 02:04:28 -07:00
3e9349bf7b
Make Block.setIconName public
2013-07-02 02:04:04 -07:00
d5549d770d
Fix bound texture in Controls screen, Closes #631 and #629
2013-07-01 23:35:03 -07:00
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
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
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
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
d072d91081
Release will now build a installer jar and use the standard 'target' output folder.
2013-07-01 21:42:33 -07:00
e156ec2940
Update ToolMaterial enum helper.
2013-07-01 21:41:47 -07:00
14295fd4b3
Merge pull request #627 from MinecraftForge/1.6
...
Merge 1.6 branch
2013-07-01 16:51:27 -07:00
ba4637f5a3
Update src distro installer script. Source distro works now!
2013-07-01 16:38:02 -07:00
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
895580de42
Merge pull request #626 from MinecraftForge/1.6
...
1.6.1 Branch Merge
2013-07-01 14:16:37 -07:00
b8b708aab6
Try absolute path, to not confuse jenkins.
2013-07-01 12:30:19 -07:00
df03ece63f
MinecraftForge/FML@7fecf2ad6b Update mcp URL.
2013-07-01 12:04:46 -07:00
f1dde02853
Deprecation sweep and update version to 8.9 to reflect 1.6.1 update.
2013-06-30 23:29:43 -07:00
3df47c0250
Update release script to generate binary patches and include deobf data.
2013-06-30 23:21:28 -07:00
17a539e173
Updated FML:
...
MinecraftForge/FML@c418da353f Cleanup coremod code, server side working now.
2013-06-30 23:20:56 -07:00
7c53448734
Update GuiIngameForge to reflect Mojang changes in 1.6.1
2013-06-30 22:32:11 -07:00
27779f096b
Add new launch configs to dev workspace.
2013-06-30 22:31:54 -07:00
ab1ddd99b6
1.6.1 Update
2013-06-30 19:43:27 -07:00
fa965e5f7c
Support dirty submodules in changelog script.
2013-06-30 19:43:09 -07:00
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
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
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
63dfed9d83
Small fixup, need to Update GuiIngameForge for new HUD changes.
2013-06-30 18:13:01 -07:00
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