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
3fdbc02c54 Updated FML: 
MinecraftForge/FML@99bb50d8f8 Improved Entity Spawn Error
MinecraftForge/FML@c0cca7f41d Merge pull request #227 from CovertJaguar/patch-1
MinecraftForge/FML@49111e9c5c Add version detection to astyle and print error if it doesnt detect version 2.0+
 Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
 2013-05-03 14:39:08 -07:00
LexManos
408ced2ea2 Merge remote-tracking branch 'refs/remotes/origin/1.5.2' 
Conflicts:
	common/net/minecraftforge/common/ForgeVersion.java
 2013-05-02 09:06:36 -07:00
LexManos
cd40aba38e Bump version number for 1.5.2 2013-05-02 09:02:26 -07:00
LexManos
46a369e932 Merge pull request #550 from cadyyan/master 
Build Script Error Handling Error
 2013-04-30 20:20:52 -07:00
James Durand
a5cc807dcd Fixed build error handling using invalid Python syntax. 2013-04-29 11:18:05 -05:00
LexManos
3242904b36 Fixed hardcoding of MC version in debug text. 2013-04-28 17:10:16 -07:00
LexManos
24f2fb1f6a Updated FML: 
MinecraftForge/FML@00f00b17bf Fix scalac detection to actually use the located command instead of defaulting to 'scalac'
 2013-04-28 16:57:19 -07:00
LexManos
784e23668b Changelog generator will now bundle failed builds with the next successful build. Should make it look better and prevent the version numbers from being confusing. 2013-04-28 15:35:14 -07:00
LexManos
a6b8055c44 Bump version to 7.7.2 so I can make a release. 2013-04-28 14:21:33 -07:00
LexManos
2c05258205 Update to 1.5.2 PR. 
MinecraftForge/FML@f0bba74a47 Update for minecraft 1.5.2
MinecraftForge/FML@62fdbad74c Update MCP's md5 for the fixed srg files.
 2013-04-28 13:28:40 -07:00
LexManos
cffaef6e0f Merge pull request #543 from Chimaine/master 
Fix unregistering of event listener
 2013-04-26 13:07:06 -07:00
Chimaine
3061fd6db6 Replaced derpy tabs with spaces 2013-04-26 21:53:09 +02:00
Chimaine
4b4f5a07a5 Fixed ListenerListInst not being rebuild after unregistering a listener, causing calls to unregistered event listeners. 2013-04-26 12:45:45 +02:00
cpw
cb14e29cdb Merge pull request #542 from KingLemming/master 
OreDictionary additions + ItemStack maxDamage hook
 2013-04-25 18:46:06 -07:00
King Lemming
b8a17e2748 -Add vanilla Ores to the Ore Dictionary. No recipe replacement required. 
-Add NBT-sensitive getMaxDamage() for ItemStack.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2013-04-25 21:36:51 -04:00
LexManos
4da2992df5 Attempted a fix for the changelog generation, should print all builds back to 1 now. 2013-04-24 10:49:33 -07:00
Christian
54b3654eaa Updated FML: 
MinecraftForge/FML@cf9b5b445b Don't leave scala running in interactive mode.
 2013-04-23 23:37:56 -04:00
Christian
b483c7ee74 Updated FML: 
MinecraftForge/FML@aa200923f0 Fix patch derp.
 2013-04-23 22:51:28 -04:00
Christian
e50fb10bff Updated FML: 
MinecraftForge/FML@ddadf93ca1 Fix when an old scalac is present on the system to not fail the build
 2013-04-23 22:44:35 -04:00
LexManos
15ffb962e4 Fix rotation issue with non-block items. 2013-04-23 19:05:35 -07:00
Christian
b56d05ef9d ItemStack delegation to Item for damage values. 2013-04-23 19:05:11 -04:00
Christian
7aa91ca635 Try and be less noisy about world leaks 2013-04-23 07:51:07 -04:00
Christian
10f1028a8f Updated FML: 
MinecraftForge/FML@cfda7fc738 Fix URL for MCP
MinecraftForge/FML@781c681216 Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP.
 2013-04-23 07:41:45 -04:00
Christian
95c144dcf0 Updated FML: 
MinecraftForge/FML@dcf069ca52 Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes.
MinecraftForge/FML@58ba24add2 Fix possible NPEs in GameData
 2013-04-22 21:15:04 -04:00
richardg867
f3caada13a Complete it, got the bug figured out 2013-04-22 13:08:59 -03:00
richardg867
27d922d470 Techne model loader (incomplete for debugging) 2013-04-21 21:32:23 -03:00
Christian
6e2d06c950 Add forge/FML data to the f3 screen. 2013-04-21 16:54:11 -04:00
Christian
de8a4c8855 Updated FML: 
MinecraftForge/FML@a3b5eaacfd Fix a small modloader compatibility derp: closes #222
MinecraftForge/FML@677a6e578e Fix scala supporting SidedProxy. It should work now.
MinecraftForge/FML@334a76de75 Update FMLDeobfuscatingRemapper.java
MinecraftForge/FML@42f1d87955 Merge pull request #224 from Glought/master
MinecraftForge/FML@2dcabe0123 Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data
MinecraftForge/FML@11ac46daeb Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code: MyBlock myBlock = new MyBlock(); GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock"); where MyBlockItem class has one constructor with signature: public MyBlockItem(int id, Block block)
MinecraftForge/FML@c3fda11d10 Merge pull request #225 from MarcinSc/master
 2013-04-21 16:43:24 -04:00
LexManos
c0d7e23c8d Merge remote-tracking branch 'refs/remotes/origin/GuiIngame' 
Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
 2013-04-21 10:42:17 -07:00
LexManos
960eaf99ef Allow spawning of Bonemeal particles even if block is not set. 2013-04-21 00:15:02 -07:00
LexManos
c998db6a86 Restore world unload event for client worlds Closes #531 2013-04-20 11:25:16 -07:00
LexManos
06727b965e Fix replaceable checks to work on blocks with a non-replacable material, Closes #532 2013-04-20 11:19:05 -07:00
LexManos
13ff75bd9c Fix the BLOCK_3D render helper for items that aren't an instance of ItemBlock Closes #533 2013-04-20 11:12:35 -07:00
LexManos
2d84dcd44e Fix logic issue in CrashReportCategory patch, blame Jadedcat for sloppy quick patch. 2013-04-19 22:08:07 -07:00
LexManos
74742fd12f Merge pull request #530 from Azanor/master 
Fix for BiomeDictionary.getTypesForBiome throwing a ClassCastException when called.
 2013-04-19 10:52:30 -07:00
Azanor
4b2aca2124 getBiomesForType will cause the same problem 2013-04-19 14:29:07 +03:00
Azanor
09dd117d1d Fix for ClassCastException when attempting to fetch Biome types from BiomeDictionary 
Attempting to fetch the BiomeDictionary types linked to a biome throws a ClassCastException. This fixes that
 2013-04-19 14:08:53 +03:00
Christian
cf90eb37f7 Simple block recolouring API: closes #525 
Fix up documentation on "rotation" API: it is up to the mod to decide interpretation of "rotation" for the mod/block.
 2013-04-18 17:21:26 -04:00
Christian
cb9e944257 Updated FML: 
MinecraftForge/FML@b3d4ea05ec Fix possible NPE in findItemStack, closes #218
 2013-04-18 16:39:11 -04:00
LexManos
cb4a073f5d Adds a field to the player for maximum health. Player.dat additions are present, getMaxHealth() needs a magic number for spawning. Closes #527 2013-04-17 19:16:34 -07:00
LexManos
a0891d74a0 Fix return value of EnchantPower hook, closes #518 2013-04-17 19:08:50 -07:00
LexManos
11115d5f3a Forge now takes control of GuiIngame's renderGameOverlay, and spits out a ton of events to give modders control of how the screen is rendered. 
Inital draft for community feedback.
 2013-04-17 18:55:06 -07:00
LexManos
d3a2243799 New hook to allow Items to render Helmet overlays like pumpkins do. 2013-04-17 14:03:59 -07:00
Christian
718e9b3756 Updated FML: 
MinecraftForge/FML@394f424185 Fix to output versions in crash logs
MinecraftForge/FML@8f35adca7a Use more expressive language when a version specifier is a simple unbounded above condition
 2013-04-16 13:57:46 -04:00
Christian
588bc8c865 Updated FML: 
MinecraftForge/FML@5673c1dd29 Add srgname to registerTileEntityWithAlternatives
MinecraftForge/FML@7aea09f4ca Add type info to properly deobfuscate overloaded fields. Fixes #210.
MinecraftForge/FML@edffd04ed2 Add in some caching of the read field descriptions for efficiency
MinecraftForge/FML@0daf1a6df4 Merge branch 'agaricusb-fix-deobf-field'
MinecraftForge/FML@ada52078c7 Merge pull request #216 from agaricusb/add-srgname
 2013-04-15 19:06:41 -04:00
LexManos
4bd7d4f3d9 Merge pull request #521 from ProgrammerHero/master 
Fixed a bug that prevented proper lava generation near bedrock
 2013-04-15 10:17:01 -07:00
ProgrammerHero
add399284b fixed a bug that prevented proper lava generation near bedrock 2013-04-15 10:14:16 -03:00
LexManos
560931a14a Fix AIOOB in crash report stack trimming. 2013-04-14 21:42:13 -07:00
LexManos
5cdc45b6da Merge pull request #515 from pahimar/master 
Fixes parsing faces for faces that do not have texture coordinate data
 2013-04-12 14:10:06 -07:00
pahimar
46eeadf3a2 Missed a bit 2013-04-12 16:05:56 -04:00