keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
2282 commits 1 branch 2 tags 103 MiB
Commit graph

2282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian
b463476815 MinecraftForge/FML@e14efe786f Some fixes and tweaks 
MinecraftForge/FML@c013870b1d Merge branch 'simplenet'
MinecraftForge/FML@30882b0c1d Clean up some warnings. Add in simple network impl
MinecraftForge/FML@9cab2ab36e Add in some tests and examples for the "simple" network stuff
MinecraftForge/FML@a429e106dd Fix bug with SSP, and hook so we can do confirmation of world loading, as well as other things
 2014-01-16 18:19:28 -05:00
Christian
c71b7554e0 MinecraftForge/FML@b362e8a273 At the request of AbrarSyed. 
MinecraftForge/FML@e344303ec7 Merge pull request #346 from Jezzadabomb338/master
MinecraftForge/FML@a4686b1261 Added basic Mojang account authentication support for development time login.
MinecraftForge/FML@dd17979a2f Fix bukkit connectivity issue.
 2014-01-16 15:07:48 -05:00
Christian
3c8bd6346f Updated FML: 
MinecraftForge/FML@1db3daa0e8 added override toString method for getting full name.
MinecraftForge/FML@acf74a3403 changed the readme to reflect new setup task.
MinecraftForge/FML@96c19b3580 undid readme change
MinecraftForge/FML@a89939e57e Merge pull request #336 from jadar/master
MinecraftForge/FML@717a8d6945 Fix csv string vs list of strings. Thanks immibis. Closes #334
MinecraftForge/FML@584c0f368b Fix potential ordering issue, clean up some imports
MinecraftForge/FML@28293b29ea Add in a simple(ish) event driven network handling system. Register using newEventDrivenChannel and you'll get a simple network handler that will fire events at the subscriber(s) of your choice, whenever a packet is received. You'll also get some convenience methods for sending to things.
MinecraftForge/FML@80b00dc796 Fix openGui. Closes #342
MinecraftForge/FML@fc69bcf280 Fix up privacy derp in TickEvent. Closes #343
MinecraftForge/FML@10d056a494 Fix possible NPE derp
MinecraftForge/FML@5da6dcc7e3 Divert connection through FML, so we can deny connections to servers that don't want us
 2014-01-14 22:02:57 -05:00
LexManos
0296803fe3 Merge pull request #926 from iChun/master 
Fix erroneous position when getting player position with changed eye height.
 2014-01-11 17:32:27 -08:00
iChun
b1f8af7f55 Squash commits so Lex would stop whining. Fix erroneous position when getting player position with changed eye height. 2014-01-12 07:59:39 +08:00
Christian
3c0ef2cce8 Updated FML: 
MinecraftForge/FML@d5bfd69e35 Fix problem with connecting to vanilla. SHOW what's modded and what's vanilla in the list. Hooks that make the blocking work to come
MinecraftForge/FML@dd098854b0 Fix the keybinding array to the right one
MinecraftForge/FML@43068eb986 Fix TargetPoint to be static
 2014-01-09 08:44:52 -05:00
Lex Manos
aab5b04a6d Attempt to prevent a NPE when MC renders a lot of things at once. 2014-01-06 20:25:34 -08:00
LexManos
4e45156eaf Merge pull request #928 from Minalien/master 
Fixed issue with forward-slashes in texture names when registering icons, fixed custom item renderer retrieval.
 2014-01-05 21:08:06 -08:00
Ken 'Minalien' Murray
9e91b0ca81 Fixed MinecraftForgeClient for custom Item Renderer implementations. Removed check for forward-slashes (/) in texture asset locations (but left check for backslash in place). 2014-01-05 21:55:04 -07:00
Lex Manos
08eb897996 MinecraftForge/FML@0d810c01fa Mark jopt needed on the server, herp derp, blame Abrar! 2014-01-05 19:08:00 -08:00
Lex Manos
0da954cc10 Fix DoublePlant placement, closes #921 2014-01-04 13:07:05 -08:00
Lex Manos
a1b68d938d Deprecate BlockFire.func_149842_a, and throw exception if someone tries to set the burn properties for air. Should prevent 'The Air is on fire!' reports. 2014-01-04 13:06:31 -08:00
LexManos
325423ab02 Merge pull request #919 from VeryBigBro/patch-2 
Create ru_RU.lang
 2014-01-04 00:08:43 -08:00
Anton
9523059d85 Create ru_RU.lang 2014-01-04 09:28:29 +03:00
Christian
95c12b6c20 Updated FML: 
MinecraftForge/FML@5317672631 Add a utility method for finding the channel handler name based on type. Should fix naming weirdnesses.
MinecraftForge/FML@9de9a15530 Fix stupid hardcoding derp
 2014-01-03 23:07:55 -05:00
Lex Manos
b6199c202e Fixed pipeline naming issue in the ForgeNetworkHandler. 2014-01-03 18:54:52 -08:00
LexManos
367c5d1ede Merge pull request #882 from Vexatos/patch-2 
Create de_DE.lang
 2014-01-03 18:29:55 -08:00
Lex Manos
ef5d66ebd2 Fixed the run config for dev time server, Cloases #913 2014-01-03 17:29:40 -08:00
Lex Manos
3953eb3f6c Fix panes/iron bars not connecting correctly. Closes #904 2014-01-03 17:26:40 -08:00
Lex Manos
b149ccbc17 Models now load from resource packs 
Models must now be loaded from resource packs using the standard resource pack reference. For example, to load a model named "assets/mymod/models/mymodel.obj", you would call AdvancedModelLoader.loadModel("mymod:models/mymodel.obj");
Closes #670
 2014-01-03 17:10:15 -08:00
Lex Manos
df0b1751e6 Fixing an infinite recursion case, Closes #916 2014-01-03 16:50:02 -08:00
LexManos
bb756115fa Merge pull request #915 from Adubbz/master 
Made canBeReplacedByLeaves default to whether a block isn't opaque rathe...
 2014-01-03 16:14:37 -08:00
Adubbz
48a9e24630 Made canBeReplacedByLeaves default to whether a block isn't opaque rather than if it is, also uninverted the checks for canBeReplacedByLeaves in WorldGenBigMushroom, WorldGenSwamp, WorldGenTaiga1 and WorldGenTaiga2 2014-01-03 18:00:11 +11:00
Christian
3896a63016 Fix inversion 2014-01-02 22:52:04 -05:00
Christian
50144d178a Updated FML: 
MinecraftForge/FML@6f1da6550e Fix up mcpname derp in GuiScrollingList.
 2014-01-02 22:46:42 -05:00
Christian
e0840e392c Updated FML: 
MinecraftForge/FML@21b13d6351 Lots of network cleanup. Gui packets now work too!
MinecraftForge/FML@b3f98d1ee0 Fix derpiness with Mods button when Realms is available
MinecraftForge/FML@cdd9d92a4f Starting work on the actual GUI. Still work to do. Needs an API.
MinecraftForge/FML@ab5eb3ccff Fix button size for GuiModList
MinecraftForge/FML@3113138bd1 Tweak button positions.
MinecraftForge/FML@c5e29b574a Avoiding redundant calls to LogManager
MinecraftForge/FML@fbc1f8f6f9 Config GUIs in the modlist now work.
MinecraftForge/FML@fa4f3015a0 Added transparent background for GuiIngameModOptions as per cpw's request. May not compile due to manual de-mcp-fication.
MinecraftForge/FML@7bf119e1e5 Fix up readmes and credits. We no longer support modloader.
MinecraftForge/FML@779cd05aa1 Tweaks
MinecraftForge/FML@b51fb91355 Merge branch 'patch-1' of github.com:airbreather/FML
 2014-01-02 22:27:42 -05:00
Vexatos
e6bfb6b7b3 Update de_DE.lang 2014-01-01 09:06:40 +01:00
LexManos
165cbd1c48 Merge pull request #912 from Adubbz/master 
Fixed sky colour transitions on a render distance of 16, fixed the World...
 2013-12-31 23:53:45 -08:00
Adubbz
bd5e7f8118 Fixed sky colour transitions on a render distance of 16, fixed the WorldGen of various things 2014-01-01 18:50:52 +11:00
LexManos
ccee30b15e Merge pull request #908 from jk-5/patch-1 
Add constructors to DimensionRegisterMessage
 2013-12-31 13:08:56 -08:00
Lex Manos
32f26561b1 Fix inverted login in BlockPistonBase causing blocks to break incorrectly. Closes #910 #909 2013-12-31 13:07:44 -08:00
Lex Manos
ea0be720a1 Update patches for AT changes. 2013-12-31 13:03:45 -08:00
Lex Manos
b31fbe528a Update for the FMLEmbeddedChannel change. 2013-12-31 12:48:59 -08:00
Christian
2f13622d37 Updated FML: 
MinecraftForge/FML@22ba6fda5e Expose the nethandler in a few places, and pull out FMLEmbeddedChannel, exposing a utility method on it. More to come.
 2013-12-31 09:46:50 -05:00
jk-5
03c4282ebf Added default constructor for reflection 2013-12-31 08:21:05 +01:00
jk-5
5ff5f1b0d5 Added a constructor and made the fields package-private 2013-12-30 21:58:53 +01:00
jk-5
07fa6615f8 Update ForgeMessage.java 2013-12-30 20:12:15 +01:00
Christian
941c2b1d14 Fix build.gradle for tweakClass property 
Updated FML:
MinecraftForge/FML@f36152398d Add in the tweakclass, fix the json for lzma @ the server.
 2013-12-30 13:27:15 -05:00
Christian
aa67bc5da6 Updated FML: 
MinecraftForge/FML@5d069629cf Allow itemstacks for furnace recipe inputs. Allow passing extra arguments through registerblock into the itemblock constructor.
 2013-12-28 18:06:18 -05:00
Christian
946166f13e Updated FML: 
MinecraftForge/FML@061288909d Fire simple network connect/disconnect gameevents.
 2013-12-28 17:53:29 -05:00
Christian
6ab5ef1315 Merge branch 'master' of github.com:Adubbz/MinecraftForge 2013-12-28 17:02:41 -05:00
Christian
5c647d4515 Fix the network handler for forge 2013-12-28 17:01:58 -05:00
Christian
906ced3c32 Updated FML: 
MinecraftForge/FML@34819c9303 Make gradlew executable on linux
MinecraftForge/FML@53a1f98414 Attempt to load old pre-1.7 worlds. ENSURE YOU HAVE A BACKUP!
MinecraftForge/FML@6a5f9e135f Fix example mod code for 1.7
 2013-12-28 13:49:18 -05:00
Adubbz
164fa8f646 Made BlockCrops.getDrops call its super method 2013-12-28 23:15:09 +11:00
Christian
f075264d6f Allow tools to override their material harvest levels. 2013-12-27 23:48:10 -05:00
Christian
cf3447feea Tidier implementation of previous commit. Should fix for subclasses of individual tools too 2013-12-27 21:48:42 -05:00
Christian
78b1b54e2b Add in harvesting abilities of the items, should fix effectiveness 2013-12-27 21:26:42 -05:00
Christian
b7eac150cc Updated FML: 
MinecraftForge/FML@f8d6213829 Update render registry
MinecraftForge/FML@ec316f113f AT for renderblocks
 2013-12-27 00:09:22 -05:00
Christian
a9876475c1 Updated FML: 
MinecraftForge/FML@268bbabee6 Fix handling world reloads when new stuffs are added
 2013-12-26 12:43:34 -05:00
LexManos
46296328ff Merge pull request #893 from iChun/master 
Add render offset to event.
 2013-12-25 01:05:45 -08:00