Commit graph

1149 commits

Author SHA1 Message Date
Christian
101ae36f57 Call stitcher for non-existent textures as well. Probably allows
for generated textures. Hmmm
2013-03-06 10:29:25 -05:00
LexManos
5ff9983772 Updated FML:
MinecraftForge/FML@debbdc00be Capture Minecraft logs into FML logging
MinecraftForge/FML@74fffc6fdc Update next render to 40
2013-03-05 15:46:26 -08:00
LexManos
c2b610d335 Fix ItemSeedFood respecting custom soils. 2013-03-05 15:44:31 -08:00
LexManos
43a1bf1425 Removed erroring imports and update build function to die on errors. 2013-03-04 20:57:42 -08:00
LexManos
20db933cee New world event for controlling potential entity spawnlists. For #430 2013-03-04 20:29:05 -08:00
LexManos
ebdc10eb1d Add callback on TextureStitched to control texture loading. 2013-03-04 19:36:19 -08:00
LexManos
2e947b364c Add helper functions for deling with custom TextureStitched 2013-03-04 18:55:15 -08:00
LexManos
88e44f0761 Fix animation location for textures with domains 2013-03-04 18:54:21 -08:00
LexManos
432e08b5d6 Updated FML:
MinecraftForge/FML@aed2cc446a Force file name encoding to UTF-8, caused different zips on different systems.
2013-03-04 18:29:23 -08:00
LexManos
493cb50583 Fixed new python changes. 2013-03-04 17:21:15 -08:00
LexManos
16475908be Rework configuration, configs should now use Config.hasChanged to deterne if thehould call save(), also re-worked the saving to not use String.format as much. 2013-03-04 16:33:52 -08:00
LexManos
1860885fee Copy over some needed files for debugging. 2013-03-04 16:33:02 -08:00
Christian
b644696668 Update submodule 2013-03-03 22:45:09 -05:00
LexManos
8daafa79b6 Change FML module to read-only connection. 2013-03-03 19:41:13 -08:00
LexManos
00c596f5a3 Update python scripts to reflect that FML is now a submodule. Delete updateasmdata as it's in /fml/ now. Build should work once again. 2013-03-03 19:30:23 -08:00
LexManos
f7d6c2384c Remove window helper batch files. 2013-03-03 18:51:39 -08:00
LexManos
95ba5f4e3a Removed GNUWin32 files and uneeded files seince FML is now a submodule. 2013-03-03 18:36:38 -08:00
LexManos
d1479d1a77 Added submodule changelog ganerator:
Updated FML:
MinecraftForge/FML@e74087ee43 Ignore again, testing submodule.
2013-03-03 14:09:48 -08:00
LexManos
d6a86916eb Testing selective commit of submodule. 2013-03-03 12:03:46 -08:00
Christian
59b8e5e93c Add in simple texture management for mods using the stitcher. Scope with "{domain}:{texture}" to
get textures that are not at /textures/<item|block>/{texture}.png but /mods/{domain}/textures/<item|block>/{texture}.png
instead
2013-03-03 14:11:31 -05:00
Christian
72e013fb66 Fix up patches for FML, also, add in FML as a submodule rather than a zip 2013-03-03 14:05:34 -05:00
LexManos
9bd8f2697c Updated Forge to s13w09c 2013-03-02 03:08:27 -08:00
LexManos
ed55969932 Not supposed to have debug stuff... 2013-02-28 03:59:57 -08:00
LexManos
a04e7912b0 Sync up with FML, Will not run nativly as you need deobfusication_data.zip in your libs folder.
We have not setup the download for that yet, to make it yourself just zip joined.srg name it deobfusication_data.zip and put it in lib
2013-02-28 03:53:42 -08:00
Christian
082ee1a5ea Merge branch 'master' into snapshot15
Conflicts:
	fml-src-1.4.7-4.7.22.539-master.zip
	fml-src-1.4.7-4.7.35.556-master.zip
	fml-src-13w02b-4.99.16.541-snapshot15.zip
2013-02-27 23:19:11 -05:00
LexManos
a766603b38 Merge commit '695b080197bd577cc34fe6dbc72b74f4a74b2d5c' into snapshot15
Testing cherry picking.
2013-02-27 00:57:35 -08:00
LexManos
a520e128d7 Fix TESR culling for beacons, and implement a good enough measure for Chests. 2013-02-24 22:55:48 -08:00
LexManos
a0bc6a3ed0 Bump version to 6.6.2, declaring Forge for MC 1.4.7 feature complete, as 1.5 is on the horizon, only bug fixes from this point on. Unless something major happens on Mojang's end. 2013-02-23 14:20:49 -08:00
LexManos
0f696c3739 Add water and lava to liquid dictionary by default, closes #419 2013-02-23 13:53:05 -08:00
LexManos
f0ea9c9106 Store the glMultiTexCoord lightmap for later use with glDrawArrays closes #406 2013-02-23 13:50:12 -08:00
LexManos
3530e0d861 Added unload event for client worlds Closes #405 2013-02-23 13:41:43 -08:00
LexManos
a7cdcc1f33 WorldGen*Trees shoud not respect custom soils. Closes #355 2013-02-23 13:07:00 -08:00
LexManos
0396ba2252 ItemStack sensitive versions of Item.getPotionEffect and Item.isPotionIngredient Closes #321 2013-02-23 12:02:36 -08:00
LexManos
f703dbb230 clarify what the size is measured in for the dormant chunk cache. -.- 2013-02-23 11:51:16 -08:00
LexManos
b754d6f301 Fix movement speed check, closes #420 2013-02-23 11:30:56 -08:00
LexManos
d9ebd3fb53 Change usage of ketSet/get to entrySet in OreDictionary, closes #422 2013-02-23 11:22:01 -08:00
LexManos
3945819851 Fixed entity colision above max world height, and below 0. Closes #400 2013-02-23 10:59:44 -08:00
LexManos
d50f150c56 Disable automatic equiti of pcke dup items for players, and fixed index issues in Player.setCurrentItemOrArmor. 2013-02-23 10:42:33 -08:00
LexManos
feca047114 Update FML to 556:
b6d6f235 Fix sprite map issue.
1158aa46 Fix Language Registry, closes #FML 163
50ce6fb3 Option to disable renaming for srgnames.
2013-02-22 15:01:45 -08:00
LexManos
53aac39d90 Jenkins needs this script, *pokes Overmind* -.- 2013-02-15 05:11:55 -08:00
LexManos
307dd48229 Fix profiler issue with RenderGlobal patch. Closes #414 2013-02-15 04:56:55 -08:00
LexManos
183b3e6316 Fix EventTransformer throwing an NPE when transforming a class that doesn't exist. Closes #413 2013-02-15 04:53:56 -08:00
LexManos
e11feec55f Fix fortune modifier always passed as 0 to idDropped closes #412 2013-02-15 04:49:33 -08:00
LexManos
dcdd7c6c0e Fixes comparison for items in creative inventory, closes #411 2013-02-15 04:43:20 -08:00
LexManos
ace8c29085 Added a hook into SlotArmor so Items can control if they are classified as a Armor type. Closes #408 2013-02-15 04:25:08 -08:00
LexManos
1c57f03722 Add item frame transformations to the EntityItem render helper Closes #407 2013-02-15 04:10:49 -08:00
LexManos
0a2e78d0c6 Made LiquidStack.isLiquidEqual(ItemStack) properly check the contained liquid, in addition to obvious id/meta closes #399 and closes #403 2013-02-15 04:00:46 -08:00
LexManos
6e302a1350 Kill .sh wrappers until someone writes more robust versions, closes #392 and closes #402 2013-02-15 03:38:46 -08:00
LexManos
57b77ce17e Actually use the line parameter in ServerChatEvent, closes #401 2013-02-15 03:22:59 -08:00
LexManos
f1987359c9 Kill generated timestamp in config files, if you want to retreive this information, usethe file's modified time. Closes #404 2013-02-15 03:18:36 -08:00