Commit graph

5280 commits

Author SHA1 Message Date
LexManos
a5efa91e6a Merge pull request #306 from MinecraftForge/1.6.4
Actually do it correctly. Should be more forge friendly now.
2013-11-17 10:04:27 -08:00
Lex Manos
45cc0bd87c Fix NPE in FakePlayers when they are created in a purely client side environment. To remove in 1.7 as FakePlayers should be used for server side interaction with the world on a player's behalf, not for client rendering. 2013-11-16 15:26:52 -08:00
Lex Manos
77c5caffd5 Fix NPE on specific tile entities when the block break event is canceled. Closes #863 2013-11-16 15:26:00 -08:00
AbrarSyed
f5335d59cc added buildSrc to the gitIgnore 2013-11-14 20:22:31 -06:00
Christian
28abe2cc3c Updated FML:
MinecraftForge/FML@23baf3a8ce Actually fix the nethandler code

Update patches
2013-11-13 19:16:24 -05:00
Christian
b7b97efe81 Actually do it correctly. Should be more forge friendly now. 2013-11-13 19:10:11 -05:00
Christian
90e3b49ea5 Merge branch '1.6.4' 2013-11-13 07:55:12 -05:00
Christian
745d601831 Updated FML:
MinecraftForge/FML@da72640c7e Way to go, missing import. *sigh*
2013-11-13 07:46:04 -05:00
Christian
56c9c3c77f Way to go, missing import. *sigh* 2013-11-13 07:45:37 -05:00
Christian
9fd39ebe79 Updated FML:
MinecraftForge/FML@b7f34629c3 Don't try and open GUIs on the server.
2013-11-12 18:05:04 -05:00
Christian
c060a44371 Don't try and open GUIs on the server. 2013-11-12 18:04:25 -05:00
Christian
4f05808b8e Don't send openGui commands from the fakeplayer. Fixes thaumcraft and probably others. 2013-11-12 17:33:24 -05:00
Christian
c8e249f919 Updated FML:
MinecraftForge/FML@6af42bc656 Add in null protection for client/server sides of handleChat
2013-11-12 17:22:20 -05:00
Christian
b8ece10f0b Merge branch '1.6.4' 2013-11-12 17:02:08 -05:00
LexManos
7adccac8ec Merge pull request #855 from CovertJaguar/patch-4
Fix Water/Lava Fluid Localization
2013-11-12 10:00:37 -08:00
CovertJaguar
0a12840e68 Fix Water/Lava Fluid Localization 2013-11-12 01:05:13 -08:00
Lex Manos
1bd3e96e6e Noop out FakePlayer.addStat. 2013-11-11 13:15:06 -08:00
pahimar
95a8b419ef Add in null protection for client/server sides of handleChat 2013-11-11 14:12:02 -05:00
Christian
82004fe703 Kill more references to modloader. 2013-11-10 13:15:26 -05:00
Christian
2867dfdfa5 Remove all public all the time from Minecraft. It is unnecessary with ModLoader gone. DEAL WITH IT. File AT public requests, make a coremod, whatever. This needed to die. 2013-11-10 12:01:26 -05:00
Christian
5cec48da72 Deprecation cleanup. Bye bye more modloader stuffs 2013-11-10 11:58:34 -05:00
Christian
a8e44dad47 First pass : kill modloader, clean up warnings 2013-11-10 11:49:06 -05:00
AbrarSyed
cdbdd0d6fb fixed versioning and stuff 2013-11-10 00:54:57 -06:00
AbrarSyed
743d10d50e Step 3: The Rebirth 2013-11-09 21:48:53 -06:00
Lex Manos
394cfa940e Join the developers list in the pom and fix the client run configs in the workspace. 2013-11-09 19:22:17 -08:00
LexManos
0ad83d84c5 Merge pull request #302 from AbrarSyed/patch-1
Update 1.6.4-rel.json
2013-11-09 19:15:34 -08:00
Abrar Syed
43bcf33f49 Update 1.6.4-rel.json 2013-11-09 21:14:58 -06:00
Christian
4cefffa1c9 Change the build to capture an MCP version, also, tweak the sources so mavenLocal can be used for ForgeGradle 2013-11-09 20:00:05 -05:00
AbrarSyed
797399ff7f Step 2: The Reformation 2013-11-09 15:57:08 -06:00
AbrarSyed
9332673944 update FML for gradle changes 2013-11-09 15:53:05 -06:00
AbrarSyed
f9563e5a34 Step 1: The Purge 2013-11-09 15:44:50 -06:00
Christian
84fd2a147e Updated FML:
MinecraftForge/FML@3d25b4e793 Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate. Closes #300
2013-11-09 14:36:42 -05:00
Christian
e378a24759 Fix license and naming 2013-11-09 14:28:54 -05:00
AbrarSyed
923b2069ec added src distribution gradle file 2013-11-09 14:28:54 -05:00
Lex Manos
b4a5c25d36 Move to install to not clutter root directory with the .bat and .sh files I know are coming. 2013-11-09 14:28:54 -05:00
Lex Manos
e034f74311 Include eclipse template workspace, for packaging in src distro. 2013-11-09 14:28:54 -05:00
Lex Manos
8364a4e522 Add gradle wrapper 2013-11-09 14:28:53 -05:00
Lex Manos
d0bae88b04 Publish to repo folder for local testing. 2013-11-09 14:28:53 -05:00
AbrarSyed
c272eceac8 Step 3: The Rebirth 2013-11-09 14:28:53 -05:00
Lex Manos
d41794a9b6 Step 2: The Reformation 2013-11-09 14:28:53 -05:00
AbrarSyed
d2d36880b0 Step 1: The Purge 2013-11-09 14:28:53 -05:00
Christian
7831555a7f Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for
scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate.
Closes #300
2013-11-09 14:27:15 -05:00
LexManos
cfd368e18f Merge pull request #852 from MinecraftForge/breakevent
Merge BreakEvent branch, as nobody has told me that it breaks everything. And in prep from 1.7.
2013-11-09 00:43:58 -08:00
Christian
a9c795b54c Updated FML:
MinecraftForge/FML@f4532410ec Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration.
2013-11-06 16:19:40 -05:00
Christian
3b42a14dba Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration. 2013-11-06 16:18:41 -05:00
Christian
8fb4546437 Updated FML:
MinecraftForge/FML@8f87021b0f Fix derp with custom properties. They work now!
2013-11-05 22:24:36 -05:00
Christian
83d8713bea Fix derp with custom properties. They work now! 2013-11-05 22:23:24 -05:00
Christian
d316d74933 Updated FML:
MinecraftForge/FML@bc57ff9e83 Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's
2013-10-31 09:40:18 -04:00
Christian
289678252b Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's 2013-10-31 09:39:34 -04:00
Christian
ebfaf83bd9 Updated FML:
MinecraftForge/FML@de8ab934d8 Fix up duplicate entries
2013-10-30 22:46:40 -04:00